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

Side by Side Diff: ash/system/chromeos/network/tray_network.h

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 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "ash/system/chromeos/network/network_icon.h" 10 #include "ash/system/chromeos/network/network_icon.h"
11 #include "ash/system/chromeos/network/network_observer.h" 11 #include "ash/system/chromeos/network/network_observer.h"
12 #include "ash/system/chromeos/network/network_portal_detector_observer.h" 12 #include "ash/system/chromeos/network/network_portal_detector_observer.h"
13 #include "ash/system/chromeos/network/tray_network_state_observer.h" 13 #include "ash/system/chromeos/network/tray_network_state_observer.h"
14 #include "ash/system/tray/system_tray_item.h" 14 #include "ash/system/tray/system_tray_item.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 17
18 namespace chromeos { 18 namespace chromeos {
19 class NetworkState; 19 class NetworkState;
20 } 20 }
21 21
22 namespace ash { 22 namespace ash {
23 namespace internal {
24
25 namespace tray { 23 namespace tray {
26 class NetworkDefaultView; 24 class NetworkDefaultView;
27 class NetworkDetailedView; 25 class NetworkDetailedView;
28 class NetworkTrayView; 26 class NetworkTrayView;
29 } 27 }
30 28
31 class TrayNetwork : public SystemTrayItem, 29 class TrayNetwork : public SystemTrayItem,
32 public NetworkObserver, 30 public NetworkObserver,
33 public NetworkPortalDetectorObserver, 31 public NetworkPortalDetectorObserver,
34 public TrayNetworkStateObserver::Delegate { 32 public TrayNetworkStateObserver::Delegate {
(...skipping 29 matching lines...) Expand all
64 private: 62 private:
65 tray::NetworkTrayView* tray_; 63 tray::NetworkTrayView* tray_;
66 tray::NetworkDefaultView* default_; 64 tray::NetworkDefaultView* default_;
67 tray::NetworkDetailedView* detailed_; 65 tray::NetworkDetailedView* detailed_;
68 bool request_wifi_view_; 66 bool request_wifi_view_;
69 scoped_ptr<TrayNetworkStateObserver> network_state_observer_; 67 scoped_ptr<TrayNetworkStateObserver> network_state_observer_;
70 68
71 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 69 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
72 }; 70 };
73 71
74 } // namespace internal
75 } // namespace ash 72 } // namespace ash
76 73
77 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 74 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
OLDNEW
« no previous file with comments | « ash/system/chromeos/network/network_state_list_detailed_view.cc ('k') | ash/system/chromeos/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698