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

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

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years 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
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_observer.h" 10 #include "ash/system/chromeos/network/network_observer.h"
11 #include "ash/system/chromeos/network/network_portal_detector_observer.h" 11 #include "ash/system/chromeos/network/network_portal_detector_observer.h"
12 #include "ash/system/chromeos/network/tray_network_state_observer.h" 12 #include "ash/system/chromeos/network/tray_network_state_observer.h"
13 #include "ash/system/tray/system_tray_item.h" 13 #include "ash/system/tray/system_tray_item.h"
14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
15 #include "base/time/time.h" 16 #include "base/time/time.h"
16 17
17 namespace chromeos { 18 namespace chromeos {
18 class NetworkState; 19 class NetworkState;
19 } 20 }
20 21
21 namespace ash { 22 namespace ash {
22 namespace tray { 23 namespace tray {
23 class NetworkDefaultView; 24 class NetworkDefaultView;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 tray::NetworkDetailedView* detailed_; 61 tray::NetworkDetailedView* detailed_;
61 bool request_wifi_view_; 62 bool request_wifi_view_;
62 scoped_ptr<TrayNetworkStateObserver> network_state_observer_; 63 scoped_ptr<TrayNetworkStateObserver> network_state_observer_;
63 64
64 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 65 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
65 }; 66 };
66 67
67 } // namespace ash 68 } // namespace ash
68 69
69 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H 70 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698