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

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

Issue 586933002: Re-Revert "[WebModals] New API for browser-scoped popup management." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2125
Patch Set: Created 6 years, 3 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
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 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
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);
198 195
199 web_contents->SetDelegate(this); 196 web_contents->SetDelegate(this);
200 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents( 197 extensions::ChromeExtensionWebContentsObserver::CreateForWebContents(
201 web_contents); 198 web_contents);
202 WebContentsObserver::Observe(web_contents); 199 WebContentsObserver::Observe(web_contents);
203 renderer_preferences_util::UpdateFromSystemSettings( 200 renderer_preferences_util::UpdateFromSystemSettings(
204 web_contents->GetMutableRendererPrefs(), 201 web_contents->GetMutableRendererPrefs(),
205 signin_profile); 202 signin_profile);
206 } 203 }
207 204
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 webui_visible_ = true; 472 webui_visible_ = true;
476 } 473 }
477 474
478 void WebUILoginView::ReturnFocus(bool reverse) { 475 void WebUILoginView::ReturnFocus(bool reverse) {
479 // Return the focus to the web contents. 476 // Return the focus to the web contents.
480 webui_login_->web_contents()->FocusThroughTabTraversal(reverse); 477 webui_login_->web_contents()->FocusThroughTabTraversal(reverse);
481 GetWidget()->Activate(); 478 GetWidget()->Activate();
482 } 479 }
483 480
484 } // namespace chromeos 481 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/ui/webui_login_view.h ('k') | chrome/browser/extensions/extension_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698