Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / login_prompt_views.cc

diff --git a/src/chrome/browser/ui/views/login_prompt_views.cc b/src/chrome/browser/ui/views/login_prompt_views.cc
index af77e99..5ea8def 100644 (file)
--- a/src/chrome/browser/ui/views/login_prompt_views.cc
+++ b/src/chrome/browser/ui/views/login_prompt_views.cc
@@ -65,7 +65,7 @@ class LoginHandlerViews : public LoginHandler,
   }
 
   virtual void WindowClosing() OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     WebContents* tab = GetWebContentsForLogin();
     if (tab)
@@ -78,7 +78,7 @@ class LoginHandlerViews : public LoginHandler,
   }
 
   virtual void DeleteDelegate() OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     // The widget is going to delete itself; clear our pointer.
     dialog_ = NULL;
@@ -96,14 +96,14 @@ class LoginHandlerViews : public LoginHandler,
   }
 
   virtual bool Cancel() OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     CancelAuth();
     return true;
   }
 
   virtual bool Accept() OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     SetAuth(login_view_->GetUsername(), login_view_->GetPassword());
     return true;
@@ -126,9 +126,9 @@ class LoginHandlerViews : public LoginHandler,
   // LoginHandler:
 
   virtual void BuildViewForPasswordManager(
-      PasswordManager* manager,
+      password_manager::PasswordManager* manager,
       const base::string16& explanation) OVERRIDE {
-    DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+    DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     // Create a new LoginView and set the model for it.  The model (password
     // manager) is owned by the WebContents, but the view is parented to the
@@ -150,7 +150,8 @@ class LoginHandlerViews : public LoginHandler,
     CHECK(modal_delegate);
     dialog_ = views::Widget::CreateWindowAsFramelessChild(
         this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
-    web_contents_modal_dialog_manager->ShowDialog(dialog_->GetNativeView());
+    web_contents_modal_dialog_manager->ShowModalDialog(
+        dialog_->GetNativeView());
     NotifyAuthNeeded();
   }