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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 | 179 |
180 // Create the password manager that is needed for the proxy. | 180 // Create the password manager that is needed for the proxy. |
181 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( | 181 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( |
182 web_contents, | 182 web_contents, |
183 autofill::ChromeAutofillClient::FromWebContents(web_contents)); | 183 autofill::ChromeAutofillClient::FromWebContents(web_contents)); |
184 | 184 |
185 // LoginHandlerViews uses a constrained window for the password manager view. | 185 // LoginHandlerViews uses a constrained window for the password manager view. |
186 WebContentsModalDialogManager::CreateForWebContents(web_contents); | 186 WebContentsModalDialogManager::CreateForWebContents(web_contents); |
187 WebContentsModalDialogManager::FromWebContents(web_contents)-> | 187 WebContentsModalDialogManager::FromWebContents(web_contents)-> |
188 SetDelegate(this); | 188 SetDelegate(this); |
| 189 if (!popup_manager_.get()) |
| 190 popup_manager_.reset(new web_modal::PopupManager(this)); |
| 191 popup_manager_->RegisterWith(web_contents); |
189 | 192 |
190 web_contents->SetDelegate(this); | 193 web_contents->SetDelegate(this); |
191 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( | 194 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( |
192 web_contents); | 195 web_contents); |
193 WebContentsObserver::Observe(web_contents); | 196 WebContentsObserver::Observe(web_contents); |
194 renderer_preferences_util::UpdateFromSystemSettings( | 197 renderer_preferences_util::UpdateFromSystemSettings( |
195 web_contents->GetMutableRendererPrefs(), | 198 web_contents->GetMutableRendererPrefs(), |
196 signin_profile); | 199 signin_profile); |
197 } | 200 } |
198 | 201 |
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
455 webui_visible_ = true; | 458 webui_visible_ = true; |
456 } | 459 } |
457 | 460 |
458 void WebUILoginView::ReturnFocus(bool reverse) { | 461 void WebUILoginView::ReturnFocus(bool reverse) { |
459 // Return the focus to the web contents. | 462 // Return the focus to the web contents. |
460 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); | 463 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); |
461 GetWidget()->Activate(); | 464 GetWidget()->Activate(); |
462 } | 465 } |
463 | 466 |
464 } // namespace chromeos | 467 } // namespace chromeos |
OLD | NEW |