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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 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
« no previous file with comments | « ash/system/network/sms_observer_unittest.cc ('k') | ash/system/network/tray_network.cc » ('j') | 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 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_ 5 #ifndef ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_ 6 #define ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 10
11 #include "ash/common/system/chromeos/network/network_observer.h" 11 #include "ash/system/network/network_observer.h"
12 #include "ash/common/system/chromeos/network/network_portal_detector_observer.h" 12 #include "ash/system/network/network_portal_detector_observer.h"
13 #include "ash/common/system/chromeos/network/tray_network_state_observer.h" 13 #include "ash/system/network/tray_network_state_observer.h"
14 #include "ash/common/system/tray/system_tray_item.h" 14 #include "ash/system/tray/system_tray_item.h"
15 #include "base/macros.h" 15 #include "base/macros.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 17
18 namespace ash { 18 namespace ash {
19 namespace tray { 19 namespace tray {
20 class NetworkDefaultView; 20 class NetworkDefaultView;
21 class NetworkDetailedView; 21 class NetworkDetailedView;
22 class NetworkTrayView; 22 class NetworkTrayView;
23 } 23 }
24 24
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 tray::NetworkDefaultView* default_; 56 tray::NetworkDefaultView* default_;
57 tray::NetworkDetailedView* detailed_; 57 tray::NetworkDetailedView* detailed_;
58 bool request_wifi_view_; 58 bool request_wifi_view_;
59 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; 59 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 61 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
62 }; 62 };
63 63
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_ 66 #endif // ASH_SYSTEM_NETWORK_TRAY_NETWORK_H_
OLDNEW
« no previous file with comments | « ash/system/network/sms_observer_unittest.cc ('k') | ash/system/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698