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/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/shell_window_ids.h" | 8 #include "ash/shell_window_ids.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
12 #include "chrome/browser/chromeos/login/helper.h" | 12 #include "chrome/browser/chromeos/login/helper.h" |
13 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" | 13 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h" |
14 #include "chrome/browser/command_updater.h" | 14 #include "chrome/browser/command_updater.h" |
15 #include "chrome/browser/password_manager/chrome_password_manager_client.h" | 15 #include "chrome/browser/password_manager/chrome_password_manager_client.h" |
16 #include "chrome/browser/profiles/profile.h" | 16 #include "chrome/browser/profiles/profile.h" |
| 17 #include "chrome/browser/ssl/security_state_model.h" |
17 #include "chrome/browser/ui/autofill/chrome_autofill_client.h" | 18 #include "chrome/browser/ui/autofill/chrome_autofill_client.h" |
18 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
19 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega
te.h" | 20 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delega
te.h" |
20 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" | 21 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" |
21 #include "chrome/browser/ui/view_ids.h" | 22 #include "chrome/browser/ui/view_ids.h" |
22 #include "chrome/browser/ui/views/toolbar/reload_button.h" | 23 #include "chrome/browser/ui/views/toolbar/reload_button.h" |
23 #include "chrome/grit/generated_resources.h" | 24 #include "chrome/grit/generated_resources.h" |
24 #include "chrome/grit/theme_resources.h" | 25 #include "chrome/grit/theme_resources.h" |
25 #include "components/password_manager/core/browser/password_manager.h" | 26 #include "components/password_manager/core/browser/password_manager.h" |
26 #include "content/public/browser/navigation_controller.h" | 27 #include "content/public/browser/navigation_controller.h" |
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 WebContents* web_contents = web_view_->GetWebContents(); | 153 WebContents* web_contents = web_view_->GetWebContents(); |
153 DCHECK(web_contents); | 154 DCHECK(web_contents); |
154 | 155 |
155 // Create the password manager that is needed for the proxy. | 156 // Create the password manager that is needed for the proxy. |
156 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( | 157 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( |
157 web_contents, | 158 web_contents, |
158 autofill::ChromeAutofillClient::FromWebContents(web_contents)); | 159 autofill::ChromeAutofillClient::FromWebContents(web_contents)); |
159 } | 160 } |
160 | 161 |
161 void SimpleWebViewDialog::Init() { | 162 void SimpleWebViewDialog::Init() { |
| 163 // Create the security state model that the toolbar model needs. |
| 164 if (web_view_->GetWebContents()) |
| 165 SecurityStateModel::CreateForWebContents(web_view_->GetWebContents()); |
162 toolbar_model_.reset(new ToolbarModelImpl(this)); | 166 toolbar_model_.reset(new ToolbarModelImpl(this)); |
163 | 167 |
164 set_background(views::Background::CreateSolidBackground(kDialogColor)); | 168 set_background(views::Background::CreateSolidBackground(kDialogColor)); |
165 | 169 |
166 // Back/Forward buttons. | 170 // Back/Forward buttons. |
167 back_ = new views::ImageButton(this); | 171 back_ = new views::ImageButton(this); |
168 back_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | | 172 back_->set_triggerable_event_flags(ui::EF_LEFT_MOUSE_BUTTON | |
169 ui::EF_MIDDLE_MOUSE_BUTTON); | 173 ui::EF_MIDDLE_MOUSE_BUTTON); |
170 back_->set_tag(IDC_BACK); | 174 back_->set_tag(IDC_BACK); |
171 back_->SetImageAlignment(views::ImageButton::ALIGN_RIGHT, | 175 back_->SetImageAlignment(views::ImageButton::ALIGN_RIGHT, |
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
383 | 387 |
384 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { | 388 void SimpleWebViewDialog::UpdateReload(bool is_loading, bool force) { |
385 if (reload_) { | 389 if (reload_) { |
386 reload_->ChangeMode( | 390 reload_->ChangeMode( |
387 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, | 391 is_loading ? ReloadButton::MODE_STOP : ReloadButton::MODE_RELOAD, |
388 force); | 392 force); |
389 } | 393 } |
390 } | 394 } |
391 | 395 |
392 } // namespace chromeos | 396 } // namespace chromeos |
OLD | NEW |