Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / login / simple_web_view_dialog.cc

diff --git a/src/chrome/browser/chromeos/login/simple_web_view_dialog.cc b/src/chrome/browser/chromeos/login/simple_web_view_dialog.cc
index 607481b..969c7d9 100644 (file)
--- a/src/chrome/browser/chromeos/login/simple_web_view_dialog.cc
+++ b/src/chrome/browser/chromeos/login/simple_web_view_dialog.cc
@@ -14,6 +14,7 @@
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/password_manager/chrome_password_manager_client.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
@@ -153,7 +154,9 @@ void SimpleWebViewDialog::StartLoad(const GURL& url) {
   DCHECK(web_contents);
 
   // Create the password manager that is needed for the proxy.
-  ChromePasswordManagerClient::CreateForWebContents(web_contents);
+  ChromePasswordManagerClient::CreateForWebContentsWithAutofillManagerDelegate(
+      web_contents,
+      autofill::TabAutofillManagerDelegate::FromWebContents(web_contents));
 }
 
 void SimpleWebViewDialog::Init() {
@@ -185,7 +188,7 @@ void SimpleWebViewDialog::Init() {
                                       this, true);
 
   // Reload button.
-  reload_ = new ReloadButton(location_bar_, command_updater_.get());
+  reload_ = new ReloadButton(command_updater_.get());
   reload_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON |
                                        ui::EF_MIDDLE_MOUSE_BUTTON);
   reload_->set_tag(IDC_RELOAD);