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

Side by Side Diff: ash/system/chromeos/network/tray_network_state_observer.cc

Issue 23684042: Eliminate NetworkManagerChanged (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ash/system/chromeos/network/tray_network_state_observer.h" 5 #include "ash/system/chromeos/network/tray_network_state_observer.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/system/chromeos/network/network_icon.h" 10 #include "ash/system/chromeos/network/network_icon.h"
(...skipping 15 matching lines...) Expand all
26 } 26 }
27 } 27 }
28 28
29 TrayNetworkStateObserver::~TrayNetworkStateObserver() { 29 TrayNetworkStateObserver::~TrayNetworkStateObserver() {
30 if (NetworkHandler::IsInitialized()) { 30 if (NetworkHandler::IsInitialized()) {
31 NetworkHandler::Get()->network_state_handler()->RemoveObserver( 31 NetworkHandler::Get()->network_state_handler()->RemoveObserver(
32 this, FROM_HERE); 32 this, FROM_HERE);
33 } 33 }
34 } 34 }
35 35
36 void TrayNetworkStateObserver::NetworkManagerChanged() {
37 delegate_->NetworkStateChanged(false);
38 }
39
40 void TrayNetworkStateObserver::NetworkListChanged() { 36 void TrayNetworkStateObserver::NetworkListChanged() {
41 delegate_->NetworkStateChanged(true); 37 delegate_->NetworkStateChanged(true);
42 network_icon::PurgeNetworkIconCache(); 38 network_icon::PurgeNetworkIconCache();
43 } 39 }
44 40
45 void TrayNetworkStateObserver::DeviceListChanged() { 41 void TrayNetworkStateObserver::DeviceListChanged() {
46 delegate_->NetworkStateChanged(false); 42 delegate_->NetworkStateChanged(false);
47 } 43 }
48 44
49 void TrayNetworkStateObserver::DefaultNetworkChanged( 45 void TrayNetworkStateObserver::DefaultNetworkChanged(
50 const chromeos::NetworkState* network) { 46 const chromeos::NetworkState* network) {
51 delegate_->NetworkStateChanged(true); 47 delegate_->NetworkStateChanged(true);
52 } 48 }
53 49
54 void TrayNetworkStateObserver::NetworkPropertiesUpdated( 50 void TrayNetworkStateObserver::NetworkPropertiesUpdated(
55 const chromeos::NetworkState* network) { 51 const chromeos::NetworkState* network) {
56 if (network == 52 if (network ==
57 NetworkHandler::Get()->network_state_handler()->DefaultNetwork()) 53 NetworkHandler::Get()->network_state_handler()->DefaultNetwork())
58 delegate_->NetworkStateChanged(true); 54 delegate_->NetworkStateChanged(true);
59 delegate_->NetworkServiceChanged(network); 55 delegate_->NetworkServiceChanged(network);
60 } 56 }
61 57
62 } // namespace ash 58 } // namespace ash
63 } // namespace internal 59 } // namespace internal
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698