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

Unified Diff: chrome/browser/chromeos/net/network_change_notifier_chromeos.h

Issue 11488011: Rename NetworkChangeNotifierChromeos to NetworkChangeNotifierNetworkLibrary (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 80 chars Created 8 years 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/net/network_change_notifier_chromeos.h
diff --git a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h b/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
deleted file mode 100644
index 4a9ccf0f2f18f4f0e778ab7bf8d74b89ce01daa9..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/net/network_change_notifier_chromeos.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright (c) 2012 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_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_
-#define CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_
-
-#include <vector>
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/memory/weak_ptr.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
-#include "chromeos/dbus/root_power_manager_observer.h"
-#include "net/base/network_change_notifier.h"
-
-namespace chromeos {
-
-class OnlineStatusReportThreadTask;
-
-class NetworkChangeNotifierChromeos
- : public net::NetworkChangeNotifier,
- public chromeos::RootPowerManagerObserver,
- public chromeos::NetworkLibrary::NetworkObserver,
- public chromeos::NetworkLibrary::NetworkManagerObserver {
- public:
- NetworkChangeNotifierChromeos();
- virtual ~NetworkChangeNotifierChromeos();
-
- // Initializes the network change notifier. Starts to observe changes
- // from the power manager and the network manager.
- void Init();
-
- // Shutdowns the network change notifier. Stops observing changes from
- // the power manager and the network manager.
- void Shutdown();
-
- private:
- friend class OnlineStatusReportThreadTask;
-
- class DnsConfigServiceChromeos;
-
- // RootPowerManagerObserver overrides:
- virtual void OnResume(const base::TimeDelta& sleep_duration) OVERRIDE;
-
- // NetworkChangeNotifier overrides:
- virtual net::NetworkChangeNotifier::ConnectionType
- GetCurrentConnectionType() const OVERRIDE;
-
- // NetworkManagerObserver overrides:
- virtual void OnNetworkManagerChanged(chromeos::NetworkLibrary* obj) OVERRIDE;
-
- // NetworkObserver overrides:
- virtual void OnNetworkChanged(chromeos::NetworkLibrary* cros,
- const chromeos::Network* network) OVERRIDE;
-
- // Initiate online status change reporting.
- void ReportConnectionChange();
- void ReportConnectionChangeOnUIThread();
- // Callback from online_notification_task_ when online state notification
- // is actually scheduled.
- void OnOnlineStateNotificationFired();
-
- // Initiates an update of data members that keep the track the network stack
- // state.
- void UpdateNetworkState(chromeos::NetworkLibrary* cros);
- // Called when a network state update has completed. Updates data members that
- // keep the track the network stack state.
- void UpdateNetworkStateCallback(chromeos::NetworkLibrary* cros,
- const NetworkIPConfigVector& ip_configs,
- const std::string& hardware_address);
- // Updates network connectivity state.
- void UpdateConnectivityState(const chromeos::Network* network);
-
- // Updates the initial state. Lets us trigger initial eval of the
- // connectivity status without waiting for an event from the connection
- // manager.
- static void UpdateInitialState(NetworkChangeNotifierChromeos* self);
-
- // Gets connection type for given |network|.
- static net::NetworkChangeNotifier::ConnectionType GetNetworkConnectionType(
- const chromeos::Network* network);
-
- // Get parameters for calculating new combined signal.
- static NetworkChangeCalculatorParams NetworkChangeCalculatorParamsChromeos();
-
- // True if we previously had an active network around.
- bool has_active_network_;
- // Current active network's connection state.
- chromeos::ConnectionState connection_state_;
- // Current active network's connection type.
- net::NetworkChangeNotifier::ConnectionType connection_type_;
- // Current active network's service path.
- std::string service_path_;
- // Current active network's IP address.
- std::string ip_address_;
- // Current active network's name servers.
- std::vector<std::string> name_servers_;
-
- scoped_ptr<DnsConfigServiceChromeos> dns_config_service_;
-
- base::WeakPtrFactory<NetworkChangeNotifierChromeos> weak_factory_;
-
- DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifierChromeos);
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_NET_NETWORK_CHANGE_NOTIFIER_CHROMEOS_H_

Powered by Google App Engine
This is Rietveld 408576698