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

Unified Diff: content/public/browser/web_contents_observer.h

Issue 102593002: Convert string16 to base::string16 in content. (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 | « content/public/browser/web_contents_delegate.cc ('k') | content/public/browser/web_drag_dest_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/web_contents_observer.h
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 5c7c93514c01282c36ca086f5e9b80311549fd87..469c9e558003c410d75a52a40188c6c765482ef8 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -126,7 +126,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
// this signal without a prior DidStartProvisionalLoadForFrame signal.
virtual void DidCommitProvisionalLoadForFrame(
int64 frame_id,
- const string16& frame_unique_name,
+ const base::string16& frame_unique_name,
bool is_main_frame,
const GURL& url,
PageTransition transition_type,
@@ -134,11 +134,11 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
// This method is invoked when the provisional load failed.
virtual void DidFailProvisionalLoad(int64 frame_id,
- const string16& frame_unique_name,
+ const base::string16& frame_unique_name,
bool is_main_frame,
const GURL& validated_url,
int error_code,
- const string16& error_description,
+ const base::string16& error_description,
RenderViewHost* render_view_host) {}
// If the provisional load corresponded to the main frame, this method is
@@ -184,7 +184,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
const GURL& validated_url,
bool is_main_frame,
int error_code,
- const string16& error_description,
+ const base::string16& error_description,
RenderViewHost* render_view_host) {}
// This method is invoked when content was loaded from an in-memory cache.
« no previous file with comments | « content/public/browser/web_contents_delegate.cc ('k') | content/public/browser/web_drag_dest_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698