trunk/src/ash/system/chromeos/network/tray_network.h - Issue 383373002: Revert 282837 because it broke non-chromeos builds.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 383373002: Revert 282837 because it broke non-chromeos builds. (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 5 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

OLD	NEW
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_observer.h"	11 #include "ash/system/chromeos/network/network_observer.h"

11 #include "ash/system/chromeos/network/network_portal_detector_observer.h"	12 #include "ash/system/chromeos/network/network_portal_detector_observer.h"

12 #include "ash/system/chromeos/network/tray_network_state_observer.h"	13 #include "ash/system/chromeos/network/tray_network_state_observer.h"

13 #include "ash/system/tray/system_tray_item.h"	14 #include "ash/system/tray/system_tray_item.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 }

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 tray::NetworkDetailedView* detailed_;	65 tray::NetworkDetailedView* detailed_;

65 bool request_wifi_view_;	66 bool request_wifi_view_;

66 scoped_ptr<TrayNetworkStateObserver> network_state_observer_;	67 scoped_ptr<TrayNetworkStateObserver> network_state_observer_;

67	68

68 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);	69 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);

69 };	70 };

70	71

71 } // namespace ash	72 } // namespace ash

72	73

73 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H	74 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H

OLD	NEW