Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / android / login_prompt_android.cc

diff --git a/src/chrome/browser/ui/android/login_prompt_android.cc b/src/chrome/browser/ui/android/login_prompt_android.cc
index 169ba90..9f5058a 100644 (file)
--- a/src/chrome/browser/ui/android/login_prompt_android.cc
+++ b/src/chrome/browser/ui/android/login_prompt_android.cc
@@ -8,12 +8,13 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/ui/android/chrome_http_auth_handler.h"
+#include "chrome/browser/ui/android/window_android_helper.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/auth.h"
+#include "ui/base/android/window_android.h"
 
 using content::BrowserThread;
 using net::URLRequest;
@@ -29,34 +30,32 @@ class LoginHandlerAndroid : public LoginHandler {
 
   virtual void OnAutofillDataAvailable(
       const base::string16& username,
-      const base::string16& password) OVERRIDE {
+      const base::string16& password) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(chrome_http_auth_handler_.get() != NULL);
     chrome_http_auth_handler_->OnAutofillDataAvailable(
         username, password);
   }
-  virtual void OnLoginModelDestroying() OVERRIDE {}
+  virtual void OnLoginModelDestroying() override {}
 
   virtual void BuildViewForPasswordManager(
       password_manager::PasswordManager* manager,
-      const base::string16& explanation) OVERRIDE {
+      const base::string16& explanation) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     // Get pointer to TabAndroid
     content::WebContents* web_contents = GetWebContentsForLogin();
     CHECK(web_contents);
-    TabAndroid* tab_android = TabAndroid::FromWebContents(web_contents);
+    WindowAndroidHelper* window_helper = WindowAndroidHelper::FromWebContents(
+        web_contents);
 
-    // Notify TabAndroid that HTTP authentication is required for current page.
-    if (tab_android) {
+    // Notify WindowAndroid that HTTP authentication is required.
+    if (window_helper->GetWindowAndroid()) {
       chrome_http_auth_handler_.reset(new ChromeHttpAuthHandler(explanation));
       chrome_http_auth_handler_->Init();
       chrome_http_auth_handler_->SetObserver(this);
-
-      tab_android->OnReceivedHttpAuthRequest(
-          chrome_http_auth_handler_.get()->GetJavaObject(),
-          base::ASCIIToUTF16(auth_info()->challenger.ToString()),
-          base::UTF8ToUTF16(auth_info()->realm));
+      chrome_http_auth_handler_->ShowDialog(
+          window_helper->GetWindowAndroid()->GetJavaObject().obj());
 
       // Register to receive a callback to OnAutofillDataAvailable().
       SetModel(manager);
@@ -71,7 +70,7 @@ class LoginHandlerAndroid : public LoginHandler {
  protected:
   virtual ~LoginHandlerAndroid() {}
 
-  virtual void CloseDialog() OVERRIDE {}
+  virtual void CloseDialog() override {}
 
  private:
   scoped_ptr<ChromeHttpAuthHandler> chrome_http_auth_handler_;