Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Side by Side Diff: chrome/browser/chromeos/login/ui/webui_login_view.cc

Issue 287123002: [WebModals] New API for browser-scoped popup management. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 180
181 // Create the password manager that is needed for the proxy. 181 // Create the password manager that is needed for the proxy.
182 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient( 182 ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
183 web_contents, 183 web_contents,
184 autofill::ChromeAutofillClient::FromWebContents(web_contents)); 184 autofill::ChromeAutofillClient::FromWebContents(web_contents));
185 185
186 // LoginHandlerViews uses a constrained window for the password manager view. 186 // LoginHandlerViews uses a constrained window for the password manager view.
187 WebContentsModalDialogManager::CreateForWebContents(web_contents); 187 WebContentsModalDialogManager::CreateForWebContents(web_contents);
188 WebContentsModalDialogManager::FromWebContents(web_contents)-> 188 WebContentsModalDialogManager::FromWebContents(web_contents)->
189 SetDelegate(this); 189 SetDelegate(this);
190 if (!popup_manager_.get())
191 popup_manager_.reset(new web_modal::PopupManager(this));
192 popup_manager_->RegisterWith(web_contents);
190 193
191 web_contents->SetDelegate(this); 194 web_contents->SetDelegate(this);
192 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( 195 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
193 web_contents); 196 web_contents);
194 WebContentsObserver::Observe(web_contents); 197 WebContentsObserver::Observe(web_contents);
195 renderer_preferences_util::UpdateFromSystemSettings( 198 renderer_preferences_util::UpdateFromSystemSettings(
196 web_contents->GetMutableRendererPrefs(), 199 web_contents->GetMutableRendererPrefs(),
197 signin_profile); 200 signin_profile);
198 } 201 }
199 202
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 webui_visible_ = true; 457 webui_visible_ = true;
455 } 458 }
456 459
457 void WebUILoginView::ReturnFocus(bool reverse) { 460 void WebUILoginView::ReturnFocus(bool reverse) {
458 // Return the focus to the web contents. 461 // Return the focus to the web contents.
459 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 462 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
460 GetWidget()->Activate(); 463 GetWidget()->Activate();
461 } 464 }
462 465
463 } // namespace chromeos 466 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698