diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 22:08:38 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-12 22:08:38 +0000 |
| commit | fa0336fa8a8909d614c9e500d76a0ebaa4844614 (patch) | |
| tree | d9d549ac71541a75740a9c4319758d723477baeb /chromeos/network/network_profile_handler.h | |
| parent | 1208940857f29eff012e834c971adcf0471ca9c1 (diff) | |
| download | chromium_src-fa0336fa8a8909d614c9e500d76a0ebaa4844614.zip chromium_src-fa0336fa8a8909d614c9e500d76a0ebaa4844614.tar.gz chromium_src-fa0336fa8a8909d614c9e500d76a0ebaa4844614.tar.bz2 | |
Merge FavoriteState into NetworkState
BUG=375955
For trivial renaming:
R=armansito@chromium.org, pneubeck@chromium.org
TBR=derat@chromium.org, xiyuan@chromium.org
Review URL: https://codereview.chromium.org/289383004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/network/network_profile_handler.h')
| -rw-r--r-- | chromeos/network/network_profile_handler.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chromeos/network/network_profile_handler.h b/chromeos/network/network_profile_handler.h index a5c1d0a..dcbbea92 100644 --- a/chromeos/network/network_profile_handler.h +++ b/chromeos/network/network_profile_handler.h @@ -66,14 +66,12 @@ class CHROMEOS_EXPORT NetworkProfileHandler NetworkProfileHandler(); // Add ShillManagerClient property observer and request initial list. - // Sets |network_state_handler_| for triggering Manager updates (can be NULL). - void Init(NetworkStateHandler* network_state_handler); + void Init(); void AddProfile(const NetworkProfile& profile); void RemoveProfile(const std::string& profile_path); private: - NetworkStateHandler* network_state_handler_; ProfileList profiles_; ObserverList<NetworkProfileObserver> observers_; |