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

Side by Side Diff: chrome/browser/chromeos/network_login_observer.cc

Issue 6976040: Revert 86914 - Move a bunch of functions from Window onto Widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 6 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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/network_login_observer.h" 5 #include "chrome/browser/chromeos/network_login_observer.h"
6 6
7 #include "chrome/browser/chromeos/cros/cros_library.h" 7 #include "chrome/browser/chromeos/cros/cros_library.h"
8 #include "chrome/browser/chromeos/cros/network_library.h" 8 #include "chrome/browser/chromeos/cros/network_library.h"
9 #include "chrome/browser/chromeos/login/background_view.h" 9 #include "chrome/browser/chromeos/login/background_view.h"
10 #include "chrome/browser/chromeos/login/login_utils.h" 10 #include "chrome/browser/chromeos/login/login_utils.h"
(...skipping 16 matching lines...) Expand all
27 } 27 }
28 28
29 void NetworkLoginObserver::CreateModalPopup(views::WindowDelegate* view) { 29 void NetworkLoginObserver::CreateModalPopup(views::WindowDelegate* view) {
30 Browser* browser = BrowserList::GetLastActive(); 30 Browser* browser = BrowserList::GetLastActive();
31 if (browser && !browser->is_type_tabbed()) { 31 if (browser && !browser->is_type_tabbed()) {
32 browser = BrowserList::FindTabbedBrowser(browser->profile(), true); 32 browser = BrowserList::FindTabbedBrowser(browser->profile(), true);
33 } 33 }
34 if (browser) { 34 if (browser) {
35 views::Window* window = browser::CreateViewsWindow( 35 views::Window* window = browser::CreateViewsWindow(
36 browser->window()->GetNativeHandle(), gfx::Rect(), view); 36 browser->window()->GetNativeHandle(), gfx::Rect(), view);
37 window->SetAlwaysOnTop(true); 37 window->SetIsAlwaysOnTop(true);
38 window->Show(); 38 window->Show();
39 } else { 39 } else {
40 // Browser not found, so we should be in login/oobe screen. 40 // Browser not found, so we should be in login/oobe screen.
41 BackgroundView* background_view = LoginUtils::Get()->GetBackgroundView(); 41 BackgroundView* background_view = LoginUtils::Get()->GetBackgroundView();
42 if (background_view) { 42 if (background_view) {
43 background_view->CreateModalPopup(view); 43 background_view->CreateModalPopup(view);
44 } 44 }
45 } 45 }
46 } 46 }
47 47
(...skipping 26 matching lines...) Expand all
74 // Always re-display the login dialog for newly added networks. 74 // Always re-display the login dialog for newly added networks.
75 if (vpn->error() == ERROR_BAD_PASSPHRASE || vpn->added()) { 75 if (vpn->error() == ERROR_BAD_PASSPHRASE || vpn->added()) {
76 CreateModalPopup(new NetworkConfigView(vpn)); 76 CreateModalPopup(new NetworkConfigView(vpn));
77 return; // Only support one failure per notification. 77 return; // Only support one failure per notification.
78 } 78 }
79 } 79 }
80 } 80 }
81 } 81 }
82 82
83 } // namespace chromeos 83 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/status/network_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698