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

Unified Diff: chrome/renderer/chrome_render_view_observer.h

Issue 105493002: Use base namespace for string16 in chrome/renderer. (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
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/chrome_render_view_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/chrome_render_view_observer.h
diff --git a/chrome/renderer/chrome_render_view_observer.h b/chrome/renderer/chrome_render_view_observer.h
index c07ef0b146e086858bd5e403a587335629dcc476..c9a33deced3e7afbc2b7f7d4d161e3aacc96b9c8 100644
--- a/chrome/renderer/chrome_render_view_observer.h
+++ b/chrome/renderer/chrome_render_view_observer.h
@@ -59,8 +59,8 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
// Holds the information received in OnWebUIJavaScript for later use
// to call EvaluateScript() to preload javascript for WebUI tests.
struct WebUIJavaScript {
- string16 frame_xpath;
- string16 jscript;
+ base::string16 frame_xpath;
+ base::string16 jscript;
int id;
bool notify_result;
};
@@ -123,8 +123,8 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
const blink::WebURL& url);
virtual void Navigate(const GURL& url) OVERRIDE;
- void OnWebUIJavaScript(const string16& frame_xpath,
- const string16& jscript,
+ void OnWebUIJavaScript(const base::string16& frame_xpath,
+ const base::string16& jscript,
int id,
bool notify_result);
void OnHandleMessageFromExternalHost(const std::string& message,
@@ -158,7 +158,7 @@ class ChromeRenderViewObserver : public content::RenderViewObserver,
// Retrieves the text from the given frame contents, the page text up to the
// maximum amount kMaxIndexChars will be placed into the given buffer.
- void CaptureText(blink::WebFrame* frame, string16* contents);
+ void CaptureText(blink::WebFrame* frame, base::string16* contents);
ExternalHostBindings* GetExternalHostBindings();
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.cc ('k') | chrome/renderer/chrome_render_view_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698