Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: webkit/tools/test_shell/test_worker/test_worker_main.cc

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webkit/tools/test_shell/test_shell_win.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 6
7 #undef LOG 7 #undef LOG
8 8
9 #include "base/at_exit.h" 9 #include "base/at_exit.h"
10 #include "base/gfx/native_widget_types.h" 10 #include "base/gfx/native_widget_types.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 ResourceType::Type request_type, 159 ResourceType::Type request_type,
160 int appcache_host_id, 160 int appcache_host_id,
161 int routing_id) { 161 int routing_id) {
162 return NULL; 162 return NULL;
163 } 163 }
164 164
165 string16 GetLocalizedString(int message_id) { 165 string16 GetLocalizedString(int message_id) {
166 return EmptyString16(); 166 return EmptyString16();
167 } 167 }
168 168
169 StringPiece GetDataResource(int resource_id) { 169 base::StringPiece GetDataResource(int resource_id) {
170 return StringPiece(); 170 return base::StringPiece();
171 } 171 }
172 172
173 void SetMediaPlayerAvailable(bool value) { 173 void SetMediaPlayerAvailable(bool value) {
174 } 174 }
175 175
176 bool IsMediaPlayerAvailable() { 176 bool IsMediaPlayerAvailable() {
177 return false; 177 return false;
178 } 178 }
179 179
180 void PrecacheUrl(const char16* url, int url_length) { 180 void PrecacheUrl(const char16* url, int url_length) {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 bool DownloadUrl(const std::string& url, HWND caller_window) { 243 bool DownloadUrl(const std::string& url, HWND caller_window) {
244 return false; 244 return false;
245 } 245 }
246 #endif 246 #endif
247 247
248 } // namespace webkit_glue 248 } // namespace webkit_glue
249 249
250 #if defined(COMPILER_GCC) 250 #if defined(COMPILER_GCC)
251 #pragma GCC visibility pop 251 #pragma GCC visibility pop
252 #endif 252 #endif
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698