Index: chrome/browser/ui/android/chrome_http_auth_handler.cc |
diff --git a/chrome/browser/ui/android/chrome_http_auth_handler.cc b/chrome/browser/ui/android/chrome_http_auth_handler.cc |
index 104de75ac8d397841161651bd59d2db1d635b421..768558daca3d6b6eb7880a7282b93cabdfc7174f 100644 |
--- a/chrome/browser/ui/android/chrome_http_auth_handler.cc |
+++ b/chrome/browser/ui/android/chrome_http_auth_handler.cc |
@@ -11,6 +11,7 @@ |
#include "base/android/scoped_java_ref.h" |
#include "base/logging.h" |
#include "base/strings/string16.h" |
+#include "base/strings/utf_string_conversions.h" |
#include "chrome/grit/generated_resources.h" |
#include "jni/ChromeHttpAuthHandler_jni.h" |
#include "ui/base/l10n/l10n_util.h" |
@@ -21,10 +22,9 @@ using base::android::ConvertJavaStringToUTF16; |
using base::android::ConvertUTF16ToJavaString; |
using base::android::ScopedJavaLocalRef; |
-ChromeHttpAuthHandler::ChromeHttpAuthHandler(const base::string16& explanation) |
- : observer_(NULL), |
- explanation_(explanation) { |
-} |
+ChromeHttpAuthHandler::ChromeHttpAuthHandler(const base::string16& authority, |
+ const base::string16& explanation) |
+ : observer_(nullptr), authority_(authority), explanation_(explanation) {} |
ChromeHttpAuthHandler::~ChromeHttpAuthHandler() {} |
@@ -81,7 +81,10 @@ void ChromeHttpAuthHandler::CancelAuth(JNIEnv* env, |
ScopedJavaLocalRef<jstring> ChromeHttpAuthHandler::GetMessageBody( |
JNIEnv* env, |
const JavaParamRef<jobject>&) { |
- return ConvertUTF16ToJavaString(env, explanation_); |
+ if (explanation_.empty()) |
+ return ConvertUTF16ToJavaString(env, authority_); |
+ return ConvertUTF16ToJavaString( |
+ env, authority_ + base::ASCIIToUTF16(" ") + explanation_); |
} |
// static |