From 187407b4820f7ca09222e12086b2b17a012ea481 Mon Sep 17 00:00:00 2001 From: "falken@chromium.org" Date: Wed, 13 Mar 2013 05:53:56 +0000 Subject: [PATCH] Revert 187767 "Add a unified observer to replace NetworkManagerO..." Reverting because it seems to cause crashes in VMTests on Chrome OS bots. > Add a unified observer to replace NetworkManagerObserver > > The new observer implementation allows one to use either of NetworkLibrary > or NetworkStateHandler to be notified of manager events. > > Also, switch over a few trivial NetworkManagerObserver consumers to > use this new observer. > > TBR=sky@ for chrome/*.gypi changes > > BUG=chromium:181250, chromium:167232 > TEST=existing tests, tested on device > > > Review URL: https://chromiumcodereview.appspot.com/12729002 TBR=gauravsh@chromium.org Review URL: https://codereview.chromium.org/12693004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187794 0039d316-1c4b-4281-b951-d872f2087c98 --- .../extensions/file_browser_event_router.cc | 25 ++++++--- .../extensions/file_browser_event_router.h | 9 +-- .../browser/chromeos/imageburner/burn_manager.cc | 7 +-- chrome/browser/chromeos/imageburner/burn_manager.h | 10 ++-- chrome/browser/chromeos/login/login_utils.cc | 14 ++--- .../chromeos/net/connectivity_state_helper.cc | 65 ++-------------------- .../chromeos/net/connectivity_state_helper.h | 20 +------ .../net/connectivity_state_helper_observer.h | 21 ------- .../chromeos/net/mock_connectivity_state_helper.h | 8 +-- .../ui/webui/chromeos/login/network_dropdown.cc | 12 ++-- .../ui/webui/chromeos/login/network_dropdown.h | 8 +-- .../chromeos/login/network_dropdown_handler.cc | 1 + chrome/chrome_browser_chromeos.gypi | 1 - chrome/chrome_tests_unit.gypi | 2 - 14 files changed, 57 insertions(+), 146 deletions(-) delete mode 100644 chrome/browser/chromeos/net/connectivity_state_helper_observer.h diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc index aad1609a6fa1..47d690b24a7b 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc @@ -12,6 +12,7 @@ #include "base/prefs/public/pref_change_registrar.h" #include "base/stl_util.h" #include "base/values.h" +#include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/drive/drive_cache.h" #include "chrome/browser/chromeos/drive/drive_file_system_interface.h" #include "chrome/browser/chromeos/drive/drive_file_system_util.h" @@ -21,7 +22,6 @@ #include "chrome/browser/chromeos/login/base_login_display_host.h" #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/chromeos/net/connectivity_state_helper.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" @@ -272,10 +272,14 @@ void FileBrowserEventRouter::Shutdown() { system_service->drive_service()->RemoveObserver(this); } - if (chromeos::ConnectivityStateHelper::IsInitialized()) { - chromeos::ConnectivityStateHelper::Get()-> - RemoveNetworkManagerObserver(this); + chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get(); + if (cros_library) { + chromeos::NetworkLibrary* network_library = + cros_library->GetNetworkLibrary(); + if (network_library) + network_library->RemoveNetworkManagerObserver(this); } + profile_ = NULL; } @@ -301,10 +305,14 @@ void FileBrowserEventRouter::ObserveFileSystemEvents() { system_service->file_system()->AddObserver(this); } - if (chromeos::ConnectivityStateHelper::IsInitialized()) { - chromeos::ConnectivityStateHelper::Get()-> - AddNetworkManagerObserver(this); + chromeos::CrosLibrary* cros_library = chromeos::CrosLibrary::Get(); + if (cros_library) { + chromeos::NetworkLibrary* network_library = + cros_library->GetNetworkLibrary(); + if (network_library) + network_library->AddNetworkManagerObserver(this); } + suspend_state_delegate_.reset(new SuspendStateDelegateImpl()); pref_change_registrar_->Init(profile_->GetPrefs()); @@ -525,7 +533,8 @@ void FileBrowserEventRouter::OnFormatEvent( } } -void FileBrowserEventRouter::NetworkManagerChanged() { +void FileBrowserEventRouter::OnNetworkManagerChanged( + chromeos::NetworkLibrary* network_library) { if (!profile_ || !extensions::ExtensionSystem::Get(profile_)->event_router()) { NOTREACHED(); diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.h b/chrome/browser/chromeos/extensions/file_browser_event_router.h index 46459c99177b..868c04279e62 100644 --- a/chrome/browser/chromeos/extensions/file_browser_event_router.h +++ b/chrome/browser/chromeos/extensions/file_browser_event_router.h @@ -14,9 +14,9 @@ #include "base/memory/scoped_ptr.h" #include "base/string16.h" #include "base/synchronization/lock.h" +#include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/drive/drive_file_system_observer.h" #include "chrome/browser/chromeos/drive/drive_resource_metadata.h" -#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h" #include "chrome/browser/google_apis/drive_service_interface.h" #include "chrome/browser/google_apis/operation_registry.h" #include "chromeos/disks/disk_mount_manager.h" @@ -35,7 +35,7 @@ class DriveFileSystemInterface; class FileBrowserEventRouter : public base::RefCountedThreadSafe, public chromeos::disks::DiskMountManager::Observer, - public chromeos::ConnectivityStateHelperObserver, + public chromeos::NetworkLibrary::NetworkManagerObserver, public drive::DriveFileSystemObserver, public google_apis::DriveServiceObserver { public: @@ -88,8 +88,9 @@ class FileBrowserEventRouter chromeos::FormatError error_code, const std::string& device_path) OVERRIDE; - // chromeos::ConnectivityStateHelperObserver override. - virtual void NetworkManagerChanged() OVERRIDE; + // chromeos::NetworkLibrary::NetworkManagerObserver override. + virtual void OnNetworkManagerChanged( + chromeos::NetworkLibrary* network_library) OVERRIDE; // drive::DriveServiceObserver overrides. virtual void OnProgressUpdate( diff --git a/chrome/browser/chromeos/imageburner/burn_manager.cc b/chrome/browser/chromeos/imageburner/burn_manager.cc index 7939f5bd8491..cae766722c4d 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.cc +++ b/chrome/browser/chromeos/imageburner/burn_manager.cc @@ -11,7 +11,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/burn_library.h" #include "chrome/browser/chromeos/cros/cros_library.h" -#include "chrome/browser/chromeos/net/connectivity_state_helper.h" #include "chrome/browser/chromeos/system/statistics_provider.h" #include "chrome/common/chrome_paths.h" #include "content/public/browser/browser_thread.h" @@ -205,7 +204,7 @@ BurnManager::BurnManager() state_machine_(new StateMachine()), bytes_image_download_progress_last_reported_(0), ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { - ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this); + CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this); CrosLibrary::Get()->GetBurnLibrary()->AddObserver(this); base::WeakPtr weak_ptr(weak_ptr_factory_.GetWeakPtr()); device_handler_.SetCallbacks( @@ -218,7 +217,7 @@ BurnManager::~BurnManager() { file_util::Delete(image_dir_, true); } CrosLibrary::Get()->GetBurnLibrary()->RemoveObserver(this); - ConnectivityStateHelper::Get()->RemoveNetworkManagerObserver(this); + CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this); } // static @@ -419,7 +418,7 @@ void BurnManager::BurnProgressUpdated(BurnLibrary* object, Observer, observers_, OnBurnProgressUpdated(event, status)); } -void BurnManager::NetworkManagerChanged() { +void BurnManager::OnNetworkManagerChanged(NetworkLibrary* obj) { // TODO(hidehiko): Split this into a class to write tests. if (state_machine_->state() == StateMachine::INITIAL && IsNetworkConnected()) FOR_EACH_OBSERVER(Observer, observers_, OnNetworkDetected()); diff --git a/chrome/browser/chromeos/imageburner/burn_manager.h b/chrome/browser/chromeos/imageburner/burn_manager.h index a7c7a2230809..ba67dc6f8f44 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.h +++ b/chrome/browser/chromeos/imageburner/burn_manager.h @@ -16,8 +16,8 @@ #include "base/observer_list.h" #include "base/time.h" #include "chrome/browser/chromeos/cros/burn_library.h" +#include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/imageburner/burn_device_handler.h" -#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h" #include "chromeos/disks/disk_mount_manager.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_fetcher_delegate.h" @@ -180,7 +180,7 @@ class StateMachine { // BurnController and helper classes defined above. class BurnManager : public net::URLFetcherDelegate, public BurnLibrary::Observer, - public ConnectivityStateHelperObserver { + public NetworkLibrary::NetworkManagerObserver { public: // Interface for classes that need to observe events for the burning image @@ -293,13 +293,13 @@ class BurnManager : public net::URLFetcherDelegate, int64 current, int64 total) OVERRIDE; - // BurnLibrary::Observer overrides. + // BurnLibrary::Observer orverrides. virtual void BurnProgressUpdated(BurnLibrary* object, BurnEvent event, const ImageBurnStatus& status) OVERRIDE; - // ConnectivityStateHelperObserver override. - virtual void NetworkManagerChanged() OVERRIDE; + // NetworkLibrary::NetworkManagerObserver interface. + virtual void OnNetworkManagerChanged(NetworkLibrary* obj) OVERRIDE; // Creates directory image will be downloaded to. // Must be called from FILE thread. diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index e571ae4c85c4..a97a0243b052 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -32,6 +32,7 @@ #include "chrome/browser/chromeos/boot_times_loader.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/cryptohome_library.h" +#include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/input_method/input_method_configuration.h" #include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" @@ -44,7 +45,6 @@ #include "chrome/browser/chromeos/login/screen_locker.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/chromeos/net/connectivity_state_helper.h" -#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h" #include "chrome/browser/chromeos/settings/cros_settings.h" #include "chrome/browser/chromeos/settings/cros_settings_names.h" #include "chrome/browser/extensions/extension_service.h" @@ -719,12 +719,13 @@ scoped_refptr LoginUtilsImpl::CreateAuthenticator( // We use a special class for this so that it can be safely leaked if we // never connect. At shutdown the order is not well defined, and it's possible // for the infrastructure needed to unregister might be unstable and crash. -class WarmingObserver : public ConnectivityStateHelperObserver, +class WarmingObserver : public NetworkLibrary::NetworkManagerObserver, public content::NotificationObserver { public: WarmingObserver() : url_request_context_getter_(NULL) { - ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this); + NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary(); + netlib->AddNetworkManagerObserver(this); // During tests, the browser_process may not be initialized yet causing // this to fail. if (g_browser_process) { @@ -738,16 +739,15 @@ class WarmingObserver : public ConnectivityStateHelperObserver, virtual ~WarmingObserver() {} // If we're now connected, prewarm the auth url. - virtual void NetworkManagerChanged() OVERRIDE { - ConnectivityStateHelper* csh = ConnectivityStateHelper::Get(); - if (csh->IsConnected()) { + virtual void OnNetworkManagerChanged(NetworkLibrary* netlib) OVERRIDE { + if (netlib->Connected()) { const int kConnectionsNeeded = 1; chrome_browser_net::PreconnectOnUIThread( GURL(GaiaUrls::GetInstance()->client_login_url()), chrome_browser_net::UrlInfo::EARLY_LOAD_MOTIVATED, kConnectionsNeeded, url_request_context_getter_); - csh->RemoveNetworkManagerObserver(this); + netlib->RemoveNetworkManagerObserver(this); delete this; } } diff --git a/chrome/browser/chromeos/net/connectivity_state_helper.cc b/chrome/browser/chromeos/net/connectivity_state_helper.cc index 505ac7da47d8..515e985885ff 100644 --- a/chrome/browser/chromeos/net/connectivity_state_helper.cc +++ b/chrome/browser/chromeos/net/connectivity_state_helper.cc @@ -10,7 +10,6 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" -#include "chromeos/network/network_state_handler_observer.h" #include "third_party/cros_system_api/dbus/service_constants.h" namespace chromeos { @@ -20,23 +19,17 @@ static ConnectivityStateHelper* g_connectivity_state_helper = NULL; // Implementation of the connectivity state helper that uses the network // state handler for fetching connectivity state. class ConnectivityStateHelperImpl - : public ConnectivityStateHelper, - public NetworkStateHandlerObserver { + : public ConnectivityStateHelper { public: ConnectivityStateHelperImpl(); virtual ~ConnectivityStateHelperImpl(); - // NetworkStateHandler overrides. virtual bool IsConnected() OVERRIDE; virtual bool IsConnectedType(const std::string& type) OVERRIDE; virtual bool IsConnectingType(const std::string& type) OVERRIDE; virtual std::string NetworkNameForType(const std::string& type) OVERRIDE; virtual std::string DefaultNetworkName() OVERRIDE; virtual bool DefaultNetworkOnline() OVERRIDE; - virtual void RequestScan() const OVERRIDE; - - // NetworkStateHandlerObserver overrides. - virtual void NetworkManagerChanged() OVERRIDE; private: NetworkStateHandler* network_state_handler_; @@ -45,32 +38,22 @@ class ConnectivityStateHelperImpl // Implementation of the connectivity state helper that uses the network // library for fetching connectivity state. class ConnectivityStateHelperNetworkLibrary - : public ConnectivityStateHelper, - public NetworkLibrary::NetworkManagerObserver { + : public ConnectivityStateHelper { public: ConnectivityStateHelperNetworkLibrary(); virtual ~ConnectivityStateHelperNetworkLibrary(); - // ConnectivityStateHelper overrides. virtual bool IsConnected() OVERRIDE; virtual bool IsConnectedType(const std::string& type) OVERRIDE; virtual bool IsConnectingType(const std::string& type) OVERRIDE; virtual std::string NetworkNameForType(const std::string& type) OVERRIDE; virtual std::string DefaultNetworkName() OVERRIDE; virtual bool DefaultNetworkOnline() OVERRIDE; - virtual void RequestScan() const OVERRIDE; - - // NetworkLibrary::NetworkManagerObserver overrides. - virtual void OnNetworkManagerChanged(NetworkLibrary* network_library); private: NetworkLibrary* network_library_; }; -ConnectivityStateHelper::ConnectivityStateHelper() {} - -ConnectivityStateHelper::~ConnectivityStateHelper() {} - // static void ConnectivityStateHelper::Initialize() { CHECK(!g_connectivity_state_helper); @@ -92,11 +75,6 @@ void ConnectivityStateHelper::InitializeForTesting( } // static -bool ConnectivityStateHelper::IsInitialized() { - return g_connectivity_state_helper != NULL; -} - -// static void ConnectivityStateHelper::Shutdown() { CHECK(g_connectivity_state_helper); delete g_connectivity_state_helper; @@ -110,24 +88,11 @@ ConnectivityStateHelper* ConnectivityStateHelper::Get() { return g_connectivity_state_helper; } -void ConnectivityStateHelper::AddNetworkManagerObserver( - ConnectivityStateHelperObserver* observer) { - network_manager_observers_.AddObserver(observer); -} - -void ConnectivityStateHelper::RemoveNetworkManagerObserver( - ConnectivityStateHelperObserver* observer) { - network_manager_observers_.RemoveObserver(observer); -} - ConnectivityStateHelperImpl::ConnectivityStateHelperImpl() { network_state_handler_ = NetworkStateHandler::Get(); - network_state_handler_->AddObserver(this); } -ConnectivityStateHelperImpl::~ConnectivityStateHelperImpl() { - NetworkStateHandler::Get()->RemoveObserver(this); -} +ConnectivityStateHelperImpl::~ConnectivityStateHelperImpl() {} bool ConnectivityStateHelperImpl::IsConnected() { return network_state_handler_->ConnectedNetworkByType( @@ -170,28 +135,16 @@ bool ConnectivityStateHelperImpl::DefaultNetworkOnline() { return true; } -void ConnectivityStateHelperImpl::RequestScan() const { - network_state_handler_->RequestScan(); -} - -void ConnectivityStateHelperImpl::NetworkManagerChanged() { - FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, network_manager_observers_, - NetworkManagerChanged()); -} - //////////////////////////////////////////////////////////////////////////////// // NetworkLibrary implementation. // ConnectivityStateHelperNetworkLibrary::ConnectivityStateHelperNetworkLibrary() { network_library_ = CrosLibrary::Get()->GetNetworkLibrary(); - network_library_->AddNetworkManagerObserver(this); } ConnectivityStateHelperNetworkLibrary::~ConnectivityStateHelperNetworkLibrary() -{ - network_library_->RemoveNetworkManagerObserver(this); -} +{} bool ConnectivityStateHelperNetworkLibrary::IsConnected() { return network_library_->Connected(); @@ -253,14 +206,4 @@ bool ConnectivityStateHelperNetworkLibrary::DefaultNetworkOnline() { return true; } -void ConnectivityStateHelperNetworkLibrary::RequestScan() const { - network_library_->RequestNetworkScan(); -} - -void ConnectivityStateHelperNetworkLibrary::OnNetworkManagerChanged( - NetworkLibrary* network_library) { - FOR_EACH_OBSERVER(ConnectivityStateHelperObserver, network_manager_observers_, - NetworkManagerChanged()); -} - } // namespace chromeos diff --git a/chrome/browser/chromeos/net/connectivity_state_helper.h b/chrome/browser/chromeos/net/connectivity_state_helper.h index e41a7b190664..030b5c691e44 100644 --- a/chrome/browser/chromeos/net/connectivity_state_helper.h +++ b/chrome/browser/chromeos/net/connectivity_state_helper.h @@ -5,10 +5,9 @@ #ifndef CHROME_BROWSER_CHROMEOS_NET_CONNECTIVITY_STATE_HELPER_H_ #define CHROME_BROWSER_CHROMEOS_NET_CONNECTIVITY_STATE_HELPER_H_ -#include "base/observer_list.h" #include "chrome/browser/chromeos/cros/network_library.h" -#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h" #include "chromeos/network/network_state_handler.h" +#include "chromeos/network/network_state_handler_observer.h" namespace chromeos { @@ -17,7 +16,7 @@ namespace chromeos { // appropriate source (e.g. NetworkStateHandler). class ConnectivityStateHelper { public: - virtual ~ConnectivityStateHelper(); + virtual ~ConnectivityStateHelper() {} // Initializes the state helper singleton to use the default (network state // handler) implementation or the network library implementation based @@ -28,9 +27,6 @@ class ConnectivityStateHelper { // (say,a MockConnectivityStateHelper) implementation. static void InitializeForTesting(ConnectivityStateHelper* csh); - // Returns true if the global instance has been initialized. - static bool IsInitialized(); - static void Shutdown(); static ConnectivityStateHelper* Get(); @@ -53,18 +49,8 @@ class ConnectivityStateHelper { // Returns true if we have a default network and are in online state. virtual bool DefaultNetworkOnline() = 0; - // Request a network scan. - virtual void RequestScan() const = 0; - - // Add/remove observers for listening to connection manager changes. - virtual void AddNetworkManagerObserver( - ConnectivityStateHelperObserver* observer); - virtual void RemoveNetworkManagerObserver( - ConnectivityStateHelperObserver* observer); - protected: - ConnectivityStateHelper(); - ObserverList network_manager_observers_; + ConnectivityStateHelper() {} }; } // namespace chromeos diff --git a/chrome/browser/chromeos/net/connectivity_state_helper_observer.h b/chrome/browser/chromeos/net/connectivity_state_helper_observer.h deleted file mode 100644 index 4fe943e68087..000000000000 --- a/chrome/browser/chromeos/net/connectivity_state_helper_observer.h +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CHROME_BROWSER_CHROMEOS_NET_CONNECTIVITY_STATE_HELPER_OBSERVER_H_ -#define CHROME_BROWSER_CHROMEOS_NET_CONNECTIVITY_STATE_HELPER_OBSERVER_H_ - -namespace chromeos { - -// A common observer interface used by the ConnectivityStateHelper object to -// relay observing events received from the (older) NetworkLibrary or the (new) -// NetworkStateHandler implementations. -class ConnectivityStateHelperObserver { - public: - // Called when there's a change on the connection manager. - virtual void NetworkManagerChanged() = 0; -}; - -} // namespace chromeos - -#endif // CHROME_BROWSER_CHROMEOS_NET_CONNECTIVITY_STATE_HELPER_OBSERVER_H_ diff --git a/chrome/browser/chromeos/net/mock_connectivity_state_helper.h b/chrome/browser/chromeos/net/mock_connectivity_state_helper.h index 70a599f24450..159f46d92a96 100644 --- a/chrome/browser/chromeos/net/mock_connectivity_state_helper.h +++ b/chrome/browser/chromeos/net/mock_connectivity_state_helper.h @@ -9,7 +9,6 @@ #include -#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h" #include "testing/gmock/include/gmock/gmock.h" namespace chromeos { @@ -24,13 +23,10 @@ class MockConnectivityStateHelper : public ConnectivityStateHelper { MOCK_METHOD1(NetworkNameForType, std::string(const std::string&)); MOCK_METHOD0(DefaultNetworkName, std::string(void)); MOCK_METHOD0(DefaultNetworkOnline, bool(void)); - MOCK_CONST_METHOD0(RequestScan, void(void)); - MOCK_METHOD1(AddNetworkManagerObserver, - void(ConnectivityStateHelperObserver*)); - MOCK_METHOD1(RemoveNetworkManagerObserver, - void(ConnectivityStateHelperObserver*)); }; + + } // namespace chromeos #endif // CHROME_BROWSER_CHROMEOS_NET_MOCK_CONNECTIVITY_STATE_HELPER_H_ diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc index 56cc4df56752..c3ddec9fec9d 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.cc @@ -8,9 +8,9 @@ #include "base/time.h" #include "base/values.h" +#include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/login/base_login_display_host.h" #include "chrome/browser/chromeos/login/login_display_host.h" -#include "chrome/browser/chromeos/net/connectivity_state_helper.h" #include "content/public/browser/web_ui.h" #include "ui/base/models/menu_model.h" #include "ui/gfx/font.h" @@ -114,8 +114,8 @@ NetworkDropdown::NetworkDropdown(content::WebUI* web_ui, network_menu_.reset(new NetworkMenuWebUI(this, web_ui)); network_icon_.reset( new NetworkMenuIcon(this, NetworkMenuIcon::DROPDOWN_MODE)); - ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this); - ConnectivityStateHelper::Get()->RequestScan(); + CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this); + CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan(); Refresh(); network_scan_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kNetworkScanIntervalSecs), @@ -123,7 +123,7 @@ NetworkDropdown::NetworkDropdown(content::WebUI* web_ui, } NetworkDropdown::~NetworkDropdown() { - ConnectivityStateHelper::Get()->RemoveNetworkManagerObserver(this); + CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this); } void NetworkDropdown::SetLastNetworkType(ConnectionType last_network_type) { @@ -146,7 +146,7 @@ bool NetworkDropdown::ShouldOpenButtonOptions() const { return !oobe_; } -void NetworkDropdown::NetworkManagerChanged() { +void NetworkDropdown::OnNetworkManagerChanged(NetworkLibrary* cros) { Refresh(); } @@ -174,7 +174,7 @@ void NetworkDropdown::SetNetworkIconAndText() { } void NetworkDropdown::ForceNetworkScan() { - ConnectivityStateHelper::Get()->RequestScan(); + CrosLibrary::Get()->GetNetworkLibrary()->RequestNetworkScan(); Refresh(); } diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h index d37ff227bc73..6b9fd2fc8a59 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown.h +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/timer.h" -#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h" +#include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/status/network_menu.h" #include "chrome/browser/chromeos/status/network_menu_icon.h" #include "ui/gfx/native_widget_types.h" @@ -23,7 +23,7 @@ class NetworkMenuWebUI; // Class which implements network dropdown menu using WebUI. class NetworkDropdown : public NetworkMenu::Delegate, public NetworkMenuIcon::Delegate, - public ConnectivityStateHelperObserver { + NetworkLibrary::NetworkManagerObserver { public: NetworkDropdown(content::WebUI* web_ui, bool oobe); virtual ~NetworkDropdown(); @@ -42,8 +42,8 @@ class NetworkDropdown : public NetworkMenu::Delegate, // NetworkMenuIcon::Delegate implementation: virtual void NetworkMenuIconChanged() OVERRIDE; - // ConnectivityStateHelperObserver implementation: - virtual void NetworkManagerChanged() OVERRIDE; + // NetworkLibrary::NetworkManagerObserver implementation: + virtual void OnNetworkManagerChanged(NetworkLibrary* cros) OVERRIDE; // Refreshes control state. Usually there's no need to do it manually // as control refreshes itself on network state change. diff --git a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc index dd204a204650..b097e438b9f7 100644 --- a/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc @@ -7,6 +7,7 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/values.h" +#include "chrome/browser/chromeos/cros/network_library.h" #include "chrome/browser/chromeos/login/webui_login_display.h" #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 55602aed9221..10ee3dba193d 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -541,7 +541,6 @@ 'browser/chromeos/mobile_config.h', 'browser/chromeos/net/connectivity_state_helper.cc', 'browser/chromeos/net/connectivity_state_helper.h', - 'browser/chromeos/net/connectivity_state_helper_observer.h', 'browser/chromeos/net/cros_network_change_notifier_factory.cc', 'browser/chromeos/net/cros_network_change_notifier_factory.h', 'browser/chromeos/net/managed_network_configuration_handler.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 6fe3ab6fcc9f..eaebb3e8423b 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -603,8 +603,6 @@ 'browser/chromeos/memory/oom_priority_manager_unittest.cc', 'browser/chromeos/mobile/mobile_activator_unittest.cc', 'browser/chromeos/mobile_config_unittest.cc', - 'browser/chromeos/net/mock_connectivity_state_helper.cc', - 'browser/chromeos/net/mock_connectivity_state_helper.h', 'browser/chromeos/net/network_portal_detector_unittest.cc', 'browser/chromeos/net/onc_utils_unittest.cc', 'browser/chromeos/offline/offline_load_page_unittest.cc', -- 2.11.4.GIT