diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 17:51:49 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-11 17:51:49 +0000 |
commit | e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545 (patch) | |
tree | b7596ac00576f552970d869e48f0517448fa70e4 /chrome/browser/ui/android/chrome_http_auth_handler.cc | |
parent | 6463f823d8a7e915d2ae0f473aabe599c73fdc30 (diff) | |
download | chromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.zip chromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.tar.gz chromium_src-e9273e19ac50bb20ea9bdcb0a65935bbf5cdd545.tar.bz2 |
Replace some string16's with base namespace in chrome/browser
TBR=sky
Review URL: https://codereview.chromium.org/101953005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/android/chrome_http_auth_handler.cc')
-rw-r--r-- | chrome/browser/ui/android/chrome_http_auth_handler.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.cc b/chrome/browser/ui/android/chrome_http_auth_handler.cc index 300a6ea..fd85d9a 100644 --- a/chrome/browser/ui/android/chrome_http_auth_handler.cc +++ b/chrome/browser/ui/android/chrome_http_auth_handler.cc @@ -21,7 +21,7 @@ using base::android::ConvertJavaStringToUTF16; using base::android::ConvertUTF16ToJavaString; using base::android::ScopedJavaLocalRef; -ChromeHttpAuthHandler::ChromeHttpAuthHandler(const string16& explanation) +ChromeHttpAuthHandler::ChromeHttpAuthHandler(const base::string16& explanation) : observer_(NULL), explanation_(explanation) { } @@ -43,8 +43,9 @@ jobject ChromeHttpAuthHandler::GetJavaObject() { return java_chrome_http_auth_handler_.obj(); } -void ChromeHttpAuthHandler::OnAutofillDataAvailable(const string16& username, - const string16& password) { +void ChromeHttpAuthHandler::OnAutofillDataAvailable( + const base::string16& username, + const base::string16& password) { DCHECK(java_chrome_http_auth_handler_.obj() != NULL); JNIEnv* env = base::android::AttachCurrentThread(); ScopedJavaLocalRef<jstring> j_username = @@ -61,8 +62,8 @@ void ChromeHttpAuthHandler::SetAuth(JNIEnv* env, jstring username, jstring password) { if (observer_) { - string16 username16 = ConvertJavaStringToUTF16(env, username); - string16 password16 = ConvertJavaStringToUTF16(env, password); + base::string16 username16 = ConvertJavaStringToUTF16(env, username); + base::string16 password16 = ConvertJavaStringToUTF16(env, password); observer_->SetAuth(username16, password16); } } |