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

Unified Diff: webkit/glue/devtools/debugger_agent_impl.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | webkit/glue/webkit_glue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/devtools/debugger_agent_impl.cc
diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc
index 70353ae7e91a750608cd9295388c09c7c1c93643..45b5470863a4ca83ea54f6229a08bd33c9e42ea8 100644
--- a/webkit/glue/devtools/debugger_agent_impl.cc
+++ b/webkit/glue/devtools/debugger_agent_impl.cc
@@ -132,18 +132,19 @@ void DebuggerAgentImpl::CreateUtilityContext(
global->Set(v8::String::New("contentWindow"), window_global);
// Inject javascript into the context.
- StringPiece basejs = webkit_glue::GetDataResource(IDR_DEVTOOLS_BASE_JS);
+ base::StringPiece basejs = webkit_glue::GetDataResource(IDR_DEVTOOLS_BASE_JS);
v8::Script::Compile(v8::String::New(basejs.as_string().c_str()))->Run();
- StringPiece injectjs_webkit =
+ base::StringPiece injectjs_webkit =
webkit_glue::GetDataResource(IDR_DEVTOOLS_INJECT_WEBKIT_JS);
v8::Script::Compile(
v8::String::New(injectjs_webkit.as_string().c_str()))->Run();
- StringPiece injectjs = webkit_glue::GetDataResource(IDR_DEVTOOLS_INJECT_JS);
+ base::StringPiece injectjs = webkit_glue::GetDataResource(
+ IDR_DEVTOOLS_INJECT_JS);
v8::Script::Compile(v8::String::New(injectjs.as_string().c_str()))->Run();
- StringPiece inject_dispatchjs = webkit_glue::GetDataResource(
+ base::StringPiece inject_dispatchjs = webkit_glue::GetDataResource(
IDR_DEVTOOLS_INJECT_DISPATCH_JS);
v8::Script::Compile(v8::String::New(
inject_dispatchjs.as_string().c_str()))->Run();
« no previous file with comments | « net/url_request/url_request_unittest.cc ('k') | webkit/glue/webkit_glue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698