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/webui_login_view.h" | 5 #include "chrome/browser/chromeos/login/ui/webui_login_view.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/system/tray/system_tray.h" | 8 #include "ash/system/tray/system_tray.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
185 | 185 |
186 // Create the password manager that is needed for the proxy. | 186 // Create the password manager that is needed for the proxy. |
187 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( | 187 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( |
188 web_contents, | 188 web_contents, |
189 autofill::ChromeAutofillClient::FromWebContents(web_contents)); | 189 autofill::ChromeAutofillClient::FromWebContents(web_contents)); |
190 | 190 |
191 // LoginHandlerViews uses a constrained window for the password manager view. | 191 // LoginHandlerViews uses a constrained window for the password manager view. |
192 WebContentsModalDialogManager::CreateForWebContents(web_contents); | 192 WebContentsModalDialogManager::CreateForWebContents(web_contents); |
193 WebContentsModalDialogManager::FromWebContents(web_contents)-> | 193 WebContentsModalDialogManager::FromWebContents(web_contents)-> |
194 SetDelegate(this); | 194 SetDelegate(this); |
| 195 if (!popup_manager_.get()) |
| 196 popup_manager_.reset(new web_modal::PopupManager(this)); |
| 197 popup_manager_->RegisterWith(web_contents); |
195 | 198 |
196 web_contents->SetDelegate(this); | 199 web_contents->SetDelegate(this); |
197 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( | 200 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( |
198 web_contents); | 201 web_contents); |
199 WebContentsObserver::Observe(web_contents); | 202 WebContentsObserver::Observe(web_contents); |
200 renderer_preferences_util::UpdateFromSystemSettings( | 203 renderer_preferences_util::UpdateFromSystemSettings( |
201 web_contents->GetMutableRendererPrefs(), | 204 web_contents->GetMutableRendererPrefs(), |
202 signin_profile); | 205 signin_profile); |
203 } | 206 } |
204 | 207 |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
473 webui_visible_ = true; | 476 webui_visible_ = true; |
474 } | 477 } |
475 | 478 |
476 void WebUILoginView::ReturnFocus(bool reverse) { | 479 void WebUILoginView::ReturnFocus(bool reverse) { |
477 // Return the focus to the web contents. | 480 // Return the focus to the web contents. |
478 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 481 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
479 GetWidget()->Activate(); | 482 GetWidget()->Activate(); |
480 } | 483 } |
481 | 484 |
482 } // namespace chromeos | 485 } // namespace chromeos |
OLD | NEW |