diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 19:18:40 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-19 19:18:40 +0000 |
commit | 50ea6da9df47806f086ead1ee83688d8712ce185 (patch) | |
tree | b88e9cef2d4a3862b33821850c9f691a2740461c /components/web_contents_delegate_android | |
parent | a67a111b321c76e99fd6ee60991d8e85177764cd (diff) | |
download | chromium_src-50ea6da9df47806f086ead1ee83688d8712ce185.zip chromium_src-50ea6da9df47806f086ead1ee83688d8712ce185.tar.gz chromium_src-50ea6da9df47806f086ead1ee83688d8712ce185.tar.bz2 |
Add base:: to string16 components/.
R=joi@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/105463003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241904 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/web_contents_delegate_android')
-rw-r--r-- | components/web_contents_delegate_android/web_contents_delegate_android.cc | 4 | ||||
-rw-r--r-- | components/web_contents_delegate_android/web_contents_delegate_android.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc index e1c91fd..07037cd 100644 --- a/components/web_contents_delegate_android/web_contents_delegate_android.cc +++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc @@ -316,8 +316,8 @@ bool WebContentsDelegateAndroid::IsFullscreenForTabOrPending( void WebContentsDelegateAndroid::ShowValidationMessage( WebContents* web_contents, const gfx::Rect& anchor_in_root_view, - const string16& main_text, - const string16& sub_text) { + const base::string16& main_text, + const base::string16& sub_text) { RenderWidgetHostView* rwhv = web_contents->GetRenderWidgetHostView(); if (rwhv) { validation_message_bubble_.reset( diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.h b/components/web_contents_delegate_android/web_contents_delegate_android.h index c9ef1af..d6720280 100644 --- a/components/web_contents_delegate_android/web_contents_delegate_android.h +++ b/components/web_contents_delegate_android/web_contents_delegate_android.h @@ -90,8 +90,8 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate { const content::WebContents* web_contents) const OVERRIDE; virtual void ShowValidationMessage(content::WebContents* web_contents, const gfx::Rect& anchor_in_root_view, - const string16& main_text, - const string16& sub_text) OVERRIDE; + const base::string16& main_text, + const base::string16& sub_text) OVERRIDE; virtual void HideValidationMessage( content::WebContents* web_contents) OVERRIDE; virtual void MoveValidationMessage( |