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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "chromeos/network/network_state.h" 12 #include "chromeos/network/network_state.h"
13 #include "chromeos/network/network_state_handler.h" 13 #include "chromeos/network/network_state_handler.h"
14 #include "third_party/cros_system_api/dbus/service_constants.h" 14 #include "third_party/cros_system_api/dbus/service_constants.h"
15 15
16 using chromeos::NetworkHandler; 16 using chromeos::NetworkHandler;
17 17
18 namespace ash { 18 namespace ash {
19 namespace internal {
20 19
21 TrayNetworkStateObserver::TrayNetworkStateObserver(Delegate* delegate) 20 TrayNetworkStateObserver::TrayNetworkStateObserver(Delegate* delegate)
22 : delegate_(delegate) { 21 : delegate_(delegate) {
23 if (NetworkHandler::IsInitialized()) { 22 if (NetworkHandler::IsInitialized()) {
24 NetworkHandler::Get()->network_state_handler()->AddObserver( 23 NetworkHandler::Get()->network_state_handler()->AddObserver(
25 this, FROM_HERE); 24 this, FROM_HERE);
26 } 25 }
27 } 26 }
28 27
29 TrayNetworkStateObserver::~TrayNetworkStateObserver() { 28 TrayNetworkStateObserver::~TrayNetworkStateObserver() {
(...skipping 19 matching lines...) Expand all
49 48
50 void TrayNetworkStateObserver::NetworkPropertiesUpdated( 49 void TrayNetworkStateObserver::NetworkPropertiesUpdated(
51 const chromeos::NetworkState* network) { 50 const chromeos::NetworkState* network) {
52 if (network == 51 if (network ==
53 NetworkHandler::Get()->network_state_handler()->DefaultNetwork()) 52 NetworkHandler::Get()->network_state_handler()->DefaultNetwork())
54 delegate_->NetworkStateChanged(true); 53 delegate_->NetworkStateChanged(true);
55 delegate_->NetworkServiceChanged(network); 54 delegate_->NetworkServiceChanged(network);
56 } 55 }
57 56
58 } // namespace ash 57 } // namespace ash
59 } // namespace internal
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/tray_network_state_observer.h ('k') | ash/system/chromeos/network/tray_sms.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698