diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
| commit | fcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch) | |
| tree | d41b14e6526a822b66d692f60dc8f648a2afb3cd /content/shell/browser/shell.h | |
| parent | 426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff) | |
| download | chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2 | |
Convert string16 to base::string16 in content.
BUG=
Review URL: https://codereview.chromium.org/102593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/browser/shell.h')
| -rw-r--r-- | content/shell/browser/shell.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h index 20515f6..1434b76 100644 --- a/content/shell/browser/shell.h +++ b/content/shell/browser/shell.h @@ -142,9 +142,9 @@ class Shell : public WebContentsDelegate, #endif virtual bool AddMessageToConsole(WebContents* source, int32 level, - const string16& message, + const base::string16& message, int32 line_no, - const string16& source_id) OVERRIDE; + const base::string16& source_id) OVERRIDE; virtual void RendererUnresponsive(WebContents* source) OVERRIDE; virtual void ActivateContents(WebContents* contents) OVERRIDE; virtual void DeactivateContents(WebContents* contents) OVERRIDE; @@ -191,7 +191,7 @@ class Shell : public WebContentsDelegate, // Sets whether the spinner is spinning. void PlatformSetIsLoading(bool loading); // Set the title of shell window - void PlatformSetTitle(const string16& title); + void PlatformSetTitle(const base::string16& title); #if defined(OS_ANDROID) void PlatformToggleFullscreenModeForTab(WebContents* web_contents, bool enter_fullscreen); |