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

Unified Diff: components/dom_distiller/content/distiller_page_web_contents.cc

Issue 107383002: Use base namespace for string16 in components and cloud_print. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
Index: components/dom_distiller/content/distiller_page_web_contents.cc
diff --git a/components/dom_distiller/content/distiller_page_web_contents.cc b/components/dom_distiller/content/distiller_page_web_contents.cc
index 0138d379b38e746a772321b35a89fa50ef79eb4b..e81976e05bf0fe0b745a8751e66d2fadc3fea9d0 100644
--- a/components/dom_distiller/content/distiller_page_web_contents.cc
+++ b/components/dom_distiller/content/distiller_page_web_contents.cc
@@ -52,7 +52,7 @@ void DistillerPageWebContents::ExecuteJavaScriptImpl(
content::RenderViewHost* host = web_contents_->GetRenderViewHost();
DCHECK(host);
host->ExecuteJavascriptInWebFrameCallbackResult(
- string16(), // frame_xpath
+ base::string16(), // frame_xpath
UTF8ToUTF16(script),
base::Bind(&DistillerPage::OnExecuteJavaScriptDone,
base::Unretained(this)));
@@ -65,12 +65,13 @@ void DistillerPageWebContents::DidFinishLoad(int64 frame_id,
content::WebContentsObserver::Observe(NULL);
OnLoadURLDone();
}
-void DistillerPageWebContents::DidFailLoad(int64 frame_id,
- const GURL& validated_url,
- bool is_main_frame,
- int error_code,
- const string16& error_description,
- RenderViewHost* render_view_host) {
+void DistillerPageWebContents::DidFailLoad(
+ int64 frame_id,
+ const GURL& validated_url,
+ bool is_main_frame,
+ int error_code,
+ const base::string16& error_description,
+ RenderViewHost* render_view_host) {
content::WebContentsObserver::Observe(NULL);
OnLoadURLFailed();
}
« no previous file with comments | « components/dom_distiller/content/distiller_page_web_contents.h ('k') | components/plugins/renderer/plugin_placeholder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698