Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/login/ui/simple_web_view_dialog.h" | 5 #include "chrome/browser/chromeos/login/ui/simple_web_view_dialog.h" |
| 6 | 6 |
| 7 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
| 8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 web_view_container_.reset(new views::WebView(profile_)); | 149 web_view_container_.reset(new views::WebView(profile_)); |
| 150 web_view_ = web_view_container_.get(); | 150 web_view_ = web_view_container_.get(); |
| 151 web_view_->set_owned_by_client(); | 151 web_view_->set_owned_by_client(); |
| 152 web_view_->GetWebContents()->SetDelegate(this); | 152 web_view_->GetWebContents()->SetDelegate(this); |
| 153 web_view_->LoadInitialURL(url); | 153 web_view_->LoadInitialURL(url); |
| 154 | 154 |
| 155 WebContents* web_contents = web_view_->GetWebContents(); | 155 WebContents* web_contents = web_view_->GetWebContents(); |
| 156 DCHECK(web_contents); | 156 DCHECK(web_contents); |
| 157 | 157 |
| 158 // Create the password manager that is needed for the proxy. | 158 // Create the password manager that is needed for the proxy. |
| 159 autofill::ChromeAutofillClient::CreateForWebContents(web_contents); | |
|
meacer
2017/03/06 21:10:23
On closer look, I think this fix is incomplete. It
| |
| 159 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( | 160 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( |
| 160 web_contents, | 161 web_contents, |
| 161 autofill::ChromeAutofillClient::FromWebContents(web_contents)); | 162 autofill::ChromeAutofillClient::FromWebContents(web_contents)); |
| 162 } | 163 } |
| 163 | 164 |
| 164 void SimpleWebViewDialog::Init() { | 165 void SimpleWebViewDialog::Init() { |
| 165 // Create the security state model that the toolbar model needs. | 166 // Create the security state model that the toolbar model needs. |
| 166 if (web_view_->GetWebContents()) | 167 if (web_view_->GetWebContents()) |
| 167 SecurityStateTabHelper::CreateForWebContents(web_view_->GetWebContents()); | 168 SecurityStateTabHelper::CreateForWebContents(web_view_->GetWebContents()); |
| 168 toolbar_model_.reset( | 169 toolbar_model_.reset( |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 380 | 381 |
| 381 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { | 382 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { |
| 382 if (reload_) { | 383 if (reload_) { |
| 383 reload_->ChangeMode( | 384 reload_->ChangeMode( |
| 384 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, | 385 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, |
| 385 force); | 386 force); |
| 386 } | 387 } |
| 387 } | 388 } |
| 388 | 389 |
| 389 } // namespace chromeos | 390 } // namespace chromeos |
| OLD | NEW |