diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 09:03:15 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-20 09:03:15 +0000 |
| commit | 05aab99c37809726da162f19dfa0702a61857a8d (patch) | |
| tree | fdcf72a3b2202eabb345ccc6a39287860e708b18 /chrome/android | |
| parent | 2f1c6d806a644e6765ef7142931af351443055db (diff) | |
| download | chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.zip chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.tar.gz chromium_src-05aab99c37809726da162f19dfa0702a61857a8d.tar.bz2 | |
Add base:: to string16s in chrome/.
TBR=sky@chromium.org
BUG=329295
Review URL: https://codereview.chromium.org/94013004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android')
| -rw-r--r-- | chrome/android/testshell/testshell_tab.cc | 6 | ||||
| -rw-r--r-- | chrome/android/testshell/testshell_tab.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/android/testshell/testshell_tab.cc b/chrome/android/testshell/testshell_tab.cc index 94065d2..285ba37 100644 --- a/chrome/android/testshell/testshell_tab.cc +++ b/chrome/android/testshell/testshell_tab.cc @@ -36,13 +36,13 @@ void TestShellTab::Destroy(JNIEnv* env, jobject obj) { } void TestShellTab::OnReceivedHttpAuthRequest(jobject auth_handler, - const string16& host, - const string16& realm) { + const base::string16& host, + const base::string16& realm) { NOTIMPLEMENTED(); } void TestShellTab::AddShortcutToBookmark( - const GURL& url, const string16& title, const SkBitmap& skbitmap, + const GURL& url, const base::string16& title, const SkBitmap& skbitmap, int r_value, int g_value, int b_value) { NOTIMPLEMENTED(); } diff --git a/chrome/android/testshell/testshell_tab.h b/chrome/android/testshell/testshell_tab.h index 38bebac4..7a9e3d2 100644 --- a/chrome/android/testshell/testshell_tab.h +++ b/chrome/android/testshell/testshell_tab.h @@ -42,11 +42,11 @@ class TestShellTab : public TabAndroid { // TabAndroid Methods // -------------------------------------------------------------------------- virtual void OnReceivedHttpAuthRequest(jobject auth_handler, - const string16& host, - const string16& realm) OVERRIDE; + const base::string16& host, + const base::string16& realm) OVERRIDE; virtual void AddShortcutToBookmark(const GURL& url, - const string16& title, + const base::string16& title, const SkBitmap& skbitmap, int r_value, int g_value, |