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

Side by Side Diff: ash/common/system/chromeos/network/network_list.h

Issue 2435903002: Move tray code from ui/chromeos/network/ (Closed)
Patch Set: . Created 4 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
6 #define UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
15 #include "ash/common/system/chromeos/network/network_list_view_base.h"
14 #include "base/macros.h" 16 #include "base/macros.h"
15 #include "chromeos/network/network_state_handler.h" 17 #include "chromeos/network/network_state_handler.h"
16 #include "ui/chromeos/network/network_icon_animation_observer.h"
17 #include "ui/chromeos/network/network_list_view_base.h"
18 #include "ui/chromeos/ui_chromeos_export.h" 18 #include "ui/chromeos/ui_chromeos_export.h"
19 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
20 20
21 namespace views { 21 namespace views {
22 class Label; 22 class Label;
23 class View; 23 class View;
24 } 24 }
25 25
26 namespace ui { 26 namespace ash {
27 27
28 struct NetworkInfo; 28 struct NetworkInfo;
29 class NetworkListDelegate; 29 class NetworkListDelegate;
30 30
31 // A list of available networks of a given type. This class is used for all 31 // A list of available networks of a given type. This class is used for all
32 // network types except VPNs. For VPNs, see the |VPNList| class. 32 // network types except VPNs. For VPNs, see the |VPNList| class.
33 class UI_CHROMEOS_EXPORT NetworkListView 33 class UI_CHROMEOS_EXPORT NetworkListView
34 : public NetworkListViewBase, 34 : public NetworkListViewBase,
35 public network_icon::AnimationObserver { 35 public network_icon::AnimationObserver {
36 public: 36 public:
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 typedef std::map<views::View*, std::string> NetworkMap; 70 typedef std::map<views::View*, std::string> NetworkMap;
71 NetworkMap network_map_; 71 NetworkMap network_map_;
72 72
73 // A map of network service paths to their view. 73 // A map of network service paths to their view.
74 typedef std::map<std::string, views::View*> ServicePathMap; 74 typedef std::map<std::string, views::View*> ServicePathMap;
75 ServicePathMap service_path_map_; 75 ServicePathMap service_path_map_;
76 76
77 DISALLOW_COPY_AND_ASSIGN(NetworkListView); 77 DISALLOW_COPY_AND_ASSIGN(NetworkListView);
78 }; 78 };
79 79
80 } // namespace ui 80 } // namespace ash
81 81
82 #endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 82 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698