1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
Index: app/clipboard/clipboard_unittest.cc
diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc
index d15247b51ba25af077154b8ce391fe2f47e961af..89702f1ae20b7a008ec729a75a27de4dfe026b75 100644
--- a/app/clipboard/clipboard_unittest.cc
+++ b/app/clipboard/clipboard_unittest.cc
@@ -232,7 +232,7 @@ TEST_F(ClipboardTest, SharedBitmapTest) {
ASSERT_TRUE(shared_buf.Map(bytes));
memcpy(shared_buf.memory(), fake_bitmap, bytes);
base::SharedMemoryHandle handle_to_share;
- base::ProcessHandle current_process = NULL;
+ base::ProcessHandle current_process = base::kNullProcessHandle;
#if defined(OS_WIN)
current_process = GetCurrentProcess();
#endif
Index: chrome/browser/search_engines/template_url.cc
diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index fe8356149d730aee4cc4525f29a4c213f646727a..43dae528ae41dcf12e37d5e8de59004026c4cb6d 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -102,7 +102,7 @@ bool TemplateURLRef::ParseParameter(size_t start,
// Remove the parameter from the string.
url->erase(start, end - start + 1);
if (parameter == kSearchTermsParameter) {
- replacements->push_back(Replacement(SEARCH_TERMS, static_cast<int>(start)));
+ replacements->push_back(Replacement(SEARCH_TERMS, start));
} else if (parameter == kCountParameter) {
if (!optional)
url->insert(start, kDefaultCount);
@@ -115,30 +115,26 @@ bool TemplateURLRef::ParseParameter(size_t start,
url->insert(start, IntToWString(page_offset_));
}
} else if (parameter == kLanguageParameter) {
- replacements->push_back(Replacement(LANGUAGE, static_cast<int>(start)));
+ replacements->push_back(Replacement(LANGUAGE, start));
} else if (parameter == kInputEncodingParameter) {
- replacements->push_back(Replacement(ENCODING, static_cast<int>(start)));
+ replacements->push_back(Replacement(ENCODING, start));
} else if (parameter == kOutputEncodingParameter) {
if (!optional)
url->insert(start, kOutputEncodingType);
} else if (parameter == kGoogleAcceptedSuggestionParameter) {
- replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION,
- static_cast<int>(start)));
+ replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION, start));
} else if (parameter == kGoogleBaseURLParameter) {
- replacements->push_back(Replacement(GOOGLE_BASE_URL,
- static_cast<int>(start)));
+ replacements->push_back(Replacement(GOOGLE_BASE_URL, start));
} else if (WideToUTF16Hack(parameter) ==
ASCIIToUTF16(kGoogleBaseSuggestURLParameter)) {
- replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL,
- static_cast<int>(start)));
+ replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start));
} else if (parameter == kGoogleOriginalQueryForSuggestionParameter) {
replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
- static_cast<int>(start)));
+ start));
} else if (parameter == kGoogleRLZParameter) {
- replacements->push_back(Replacement(GOOGLE_RLZ, static_cast<int>(start)));
+ replacements->push_back(Replacement(GOOGLE_RLZ, start));
} else if (parameter == kGoogleUnescapedSearchTermsParameter) {
- replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS,
- static_cast<int>(start)));
+ replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start));
} else {
// It can be some garbage but can also be a javascript block. Put it back.
url->insert(start, full_parameter);
Index: chrome/browser/search_engines/template_url.h
diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h
index 90cd7341ca17818e2ba792e2d24be8c266420a6e..5a5c67f18a1611c646a5c722b39cc7efeb4e8db5 100644
--- a/chrome/browser/search_engines/template_url.h
+++ b/chrome/browser/search_engines/template_url.h
@@ -136,9 +136,10 @@ class TemplateURLRef {
// Used to identify an element of the raw url that can be replaced.
struct Replacement {
- Replacement(ReplacementType type, int index) : type(type), index(index) {}
+ Replacement(ReplacementType type, size_t index)
+ : type(type), index(index) {}
ReplacementType type;
- int index;
+ size_t index;
};
// The list of elements to replace.
Index: chrome/browser/search_engines/template_url_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index b2ef832b1bc1b5a37e8c9b6d4e61a3c1371977ce..5f9bfff80929da9683e1aca58ffe079bab947187 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -421,7 +421,7 @@ TEST_F(TemplateURLTest, ParseParameterKnown) {
EXPECT_TRUE(url_ref.ParseParameter(0, 12, &parsed_url, &replacements));
EXPECT_EQ(std::wstring(), parsed_url);
ASSERT_EQ(1U, replacements.size());
- EXPECT_EQ(0, replacements[0].index);
+ EXPECT_EQ(static_cast<size_t>(0), replacements[0].index);
EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
}
@@ -468,7 +468,7 @@ TEST_F(TemplateURLTest, ParseURLTwoParameters) {
EXPECT_EQ(L"{}{}",
url_ref.ParseURL(L"{}{{searchTerms}}", &replacements, &valid));
ASSERT_EQ(1U, replacements.size());
- EXPECT_EQ(3, replacements[0].index);
+ EXPECT_EQ(static_cast<size_t>(3), replacements[0].index);
EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
EXPECT_TRUE(valid);
}
@@ -479,7 +479,7 @@ TEST_F(TemplateURLTest, ParseURLNestedParameter) {
bool valid = false;
EXPECT_EQ(L"{", url_ref.ParseURL(L"{{searchTerms}", &replacements, &valid));
ASSERT_EQ(1U, replacements.size());
- EXPECT_EQ(1, replacements[0].index);
+ EXPECT_EQ(static_cast<size_t>(1), replacements[0].index);
EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
EXPECT_TRUE(valid);
}
Index: chrome/plugin/webplugin_delegate_stub.cc
diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc
index 9b1ec53c8accbd22cd7e66b18540857629510708..0f47bd85cb7bfdeb5a0dcd66e0b2685428c5e5bf 100644
--- a/chrome/plugin/webplugin_delegate_stub.cc
+++ b/chrome/plugin/webplugin_delegate_stub.cc
@@ -158,7 +158,7 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
command_line.GetSwitchValue(switches::kPluginPath));
- gfx::PluginWindowHandle parent = 0;
+ gfx::PluginWindowHandle parent = gfx::kNullPluginWindow;
#if defined(OS_WIN)
parent = gfx::NativeViewFromId(params.containing_window);
#elif defined(OS_LINUX)
Index: chrome/renderer/webplugin_delegate_pepper.cc
diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc
index 683382d76a89d5e6a8b15bb676f9a1b099ad7018..c545c875b3ec9899713ee6c86f43340261faa311 100644
--- a/chrome/renderer/webplugin_delegate_pepper.cc
+++ b/chrome/renderer/webplugin_delegate_pepper.cc
@@ -395,7 +395,7 @@ NPError WebPluginDelegatePepper::Device2DInitializeContext(
// This is a windowless plugin, so set it to have no handle. Defer this
// until we know the plugin will use the 2D device. If it uses the 3D device
// it will have a window handle.
- plugin_->SetWindow(0);
+ plugin_->SetWindow(gfx::kNullPluginWindow);
scoped_ptr<Graphics2DDeviceContext> g2d(new Graphics2DDeviceContext(this));
NPError status = g2d->Initialize(window_rect_, config, context);
Index: webkit/glue/plugins/plugin_host.cc
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index 41d2fa288727c0d0db0a064f3a94ba24782c69a2..a6e0fde83d3883e967b265e953ae1538f88303ff 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -656,7 +656,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) {
NPError rv = NPERR_GENERIC_ERROR;
- switch (variable) {
+ switch (static_cast<int>(variable)) {
case NPNVWindowNPObject: {
scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id);
NPObject *np_object = plugin->webplugin()->GetWindowScriptNPObject();
Index: webkit/glue/plugins/webplugin_impl.cc
diff --git a/webkit/glue/plugins/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc
index 8a0e75e63b6f4570c7d78f6ce8afc8eca4ba9251..693232ba1fdde8de816717dffc29b19acf59f6f1 100644
--- a/webkit/glue/plugins/webplugin_impl.cc
+++ b/webkit/glue/plugins/webplugin_impl.cc
@@ -412,7 +412,7 @@ WebPluginImpl::WebPluginImpl(
WebFrame* webframe, const WebPluginParams& params,
const base::WeakPtr<WebPluginPageDelegate>& page_delegate)
: windowless_(false),
- window_(0),
+ window_(gfx::kNullPluginWindow),
accepts_input_events_(false),
page_delegate_(page_delegate),
webframe_(webframe),
@@ -473,7 +473,7 @@ void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) {
void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) {
DCHECK_EQ(window, window_);
- window_ = 0;
+ window_ = gfx::kNullPluginWindow;
if (page_delegate_)
page_delegate_->WillDestroyPluginWindow(window);
}
|
