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

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

Issue 12210137: Revert 181896 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
« no previous file with comments | « ash/system/chromeos/network/tray_network_state_observer.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ash/system/chromeos/network/network_detailed_view.h" 7 #include "ash/system/chromeos/network/network_detailed_view.h"
8 #include "ash/system/chromeos/network/tray_network.h" 8 #include "ash/system/chromeos/network/tray_network.h"
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "chromeos/network/network_state_handler.h" 10 #include "chromeos/network/network_state_handler.h"
(...skipping 25 matching lines...) Expand all
36 } 36 }
37 wifi_state_ = wifi_state; 37 wifi_state_ = wifi_state;
38 if (detailed) 38 if (detailed)
39 detailed->ManagerChanged(); 39 detailed->ManagerChanged();
40 } 40 }
41 41
42 void TrayNetworkStateObserver::NetworkListChanged() { 42 void TrayNetworkStateObserver::NetworkListChanged() {
43 tray::NetworkDetailedView* detailed = tray_->detailed(); 43 tray::NetworkDetailedView* detailed = tray_->detailed();
44 if (detailed) 44 if (detailed)
45 detailed->NetworkListChanged(); 45 detailed->NetworkListChanged();
46 tray_->TrayNetworkUpdated();
47 }
48
49 void TrayNetworkStateObserver::DeviceListChanged() {
50 tray::NetworkDetailedView* detailed = tray_->detailed();
51 if (detailed)
52 detailed->ManagerChanged();
53 tray_->TrayNetworkUpdated();
54 }
55
56 void TrayNetworkStateObserver::DefaultNetworkChanged(
57 const chromeos::NetworkState* network) {
58 tray_->TrayNetworkUpdated();
46 } 59 }
47 60
48 void TrayNetworkStateObserver::NetworkPropertiesUpdated( 61 void TrayNetworkStateObserver::NetworkPropertiesUpdated(
49 const chromeos::NetworkState* network) { 62 const chromeos::NetworkState* network) {
63 tray_->NetworkServiceChanged(network);
50 tray::NetworkDetailedView* detailed = tray_->detailed(); 64 tray::NetworkDetailedView* detailed = tray_->detailed();
51 if (detailed) 65 if (detailed)
52 detailed->NetworkServiceChanged(network); 66 detailed->NetworkServiceChanged(network);
53 } 67 }
54 68
55 } // namespace ash 69 } // namespace ash
56 } // namespace internal 70 } // namespace internal
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/tray_network_state_observer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698