| OLD | NEW |
| 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" |
| 11 #include "chrome/browser/chromeos/options/network_config_view.h" | 11 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 12 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/browser_list.h" | 13 #include "chrome/browser/ui/browser_list.h" |
| 14 #include "chrome/browser/ui/browser_window.h" | 14 #include "chrome/browser/ui/browser_window.h" |
| 15 #include "chrome/browser/ui/dialog_style.h" |
| 15 #include "chrome/browser/ui/views/window.h" | 16 #include "chrome/browser/ui/views/window.h" |
| 16 #include "views/widget/widget.h" | 17 #include "views/widget/widget.h" |
| 17 #include "views/widget/widget_delegate.h" | 18 #include "views/widget/widget_delegate.h" |
| 18 | 19 |
| 19 namespace chromeos { | 20 namespace chromeos { |
| 20 | 21 |
| 21 NetworkLoginObserver::NetworkLoginObserver(NetworkLibrary* netlib) { | 22 NetworkLoginObserver::NetworkLoginObserver(NetworkLibrary* netlib) { |
| 22 netlib->AddNetworkManagerObserver(this); | 23 netlib->AddNetworkManagerObserver(this); |
| 23 } | 24 } |
| 24 | 25 |
| 25 NetworkLoginObserver::~NetworkLoginObserver() { | 26 NetworkLoginObserver::~NetworkLoginObserver() { |
| 26 CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this); | 27 CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this); |
| 27 } | 28 } |
| 28 | 29 |
| 29 void NetworkLoginObserver::CreateModalPopup(views::WidgetDelegate* view) { | 30 void NetworkLoginObserver::CreateModalPopup(views::WidgetDelegate* view) { |
| 30 #if defined(USE_AURA) | 31 #if defined(USE_AURA) |
| 31 // TODO(saintlou): This needs to be done for Aura. | 32 // TODO(saintlou): This needs to be done for Aura. |
| 32 NOTIMPLEMENTED(); | 33 NOTIMPLEMENTED(); |
| 33 #else | 34 #else |
| 34 Browser* browser = BrowserList::GetLastActive(); | 35 Browser* browser = BrowserList::GetLastActive(); |
| 35 if (browser && !browser->is_type_tabbed()) { | 36 if (browser && !browser->is_type_tabbed()) { |
| 36 browser = BrowserList::FindTabbedBrowser(browser->profile(), true); | 37 browser = BrowserList::FindTabbedBrowser(browser->profile(), true); |
| 37 } | 38 } |
| 38 if (browser) { | 39 if (browser) { |
| 39 views::Widget* window = browser::CreateViewsWindow( | 40 views::Widget* window = browser::CreateViewsWindow( |
| 40 browser->window()->GetNativeHandle(), view); | 41 browser->window()->GetNativeHandle(), view, STYLE_GENERIC); |
| 41 window->SetAlwaysOnTop(true); | 42 window->SetAlwaysOnTop(true); |
| 42 window->Show(); | 43 window->Show(); |
| 43 } else { | 44 } else { |
| 44 // Browser not found, so we should be in login/oobe screen. | 45 // Browser not found, so we should be in login/oobe screen. |
| 45 BackgroundView* background_view = LoginUtils::Get()->GetBackgroundView(); | 46 BackgroundView* background_view = LoginUtils::Get()->GetBackgroundView(); |
| 46 if (background_view) { | 47 if (background_view) { |
| 47 background_view->CreateModalPopup(view); | 48 background_view->CreateModalPopup(view); |
| 48 } | 49 } |
| 49 } | 50 } |
| 50 #endif | 51 #endif |
| (...skipping 27 matching lines...) Expand all Loading... |
| 78 // Display login dialog for any error or newly added network. | 79 // Display login dialog for any error or newly added network. |
| 79 if (vpn->error() != ERROR_NO_ERROR || vpn->added()) { | 80 if (vpn->error() != ERROR_NO_ERROR || vpn->added()) { |
| 80 CreateModalPopup(new NetworkConfigView(vpn)); | 81 CreateModalPopup(new NetworkConfigView(vpn)); |
| 81 return; // Only support one failure per notification. | 82 return; // Only support one failure per notification. |
| 82 } | 83 } |
| 83 } | 84 } |
| 84 } | 85 } |
| 85 } | 86 } |
| 86 | 87 |
| 87 } // namespace chromeos | 88 } // namespace chromeos |
| OLD | NEW |