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

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

Issue 2435903002: Move tray code from ui/chromeos/network/ (Closed)
Patch Set: Rebase Created 4 years, 1 month 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"
19 #include "ui/gfx/image/image_skia.h" 18 #include "ui/gfx/image/image_skia.h"
20 19
21 namespace views { 20 namespace views {
22 class Label; 21 class Label;
23 class View; 22 class View;
24 } 23 }
25 24
26 namespace ui { 25 namespace ash {
27 26
28 struct NetworkInfo; 27 struct NetworkInfo;
29 class NetworkListDelegate; 28 class NetworkListDelegate;
30 29
31 // A list of available networks of a given type. This class is used for all 30 // 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. 31 // network types except VPNs. For VPNs, see the |VPNList| class.
33 class UI_CHROMEOS_EXPORT NetworkListView 32 class NetworkListView : public NetworkListViewBase,
34 : public NetworkListViewBase, 33 public network_icon::AnimationObserver {
35 public network_icon::AnimationObserver {
36 public: 34 public:
37 explicit NetworkListView(NetworkListDelegate* delegate); 35 explicit NetworkListView(NetworkListDelegate* delegate);
38 ~NetworkListView() override; 36 ~NetworkListView() override;
39 37
40 // NetworkListViewBase: 38 // NetworkListViewBase:
41 void Update() override; 39 void Update() override;
42 bool IsNetworkEntry(views::View* view, 40 bool IsNetworkEntry(views::View* view,
43 std::string* service_path) const override; 41 std::string* service_path) const override;
44 42
45 private: 43 private:
(...skipping 24 matching lines...) Expand all
70 typedef std::map<views::View*, std::string> NetworkMap; 68 typedef std::map<views::View*, std::string> NetworkMap;
71 NetworkMap network_map_; 69 NetworkMap network_map_;
72 70
73 // A map of network service paths to their view. 71 // A map of network service paths to their view.
74 typedef std::map<std::string, views::View*> ServicePathMap; 72 typedef std::map<std::string, views::View*> ServicePathMap;
75 ServicePathMap service_path_map_; 73 ServicePathMap service_path_map_;
76 74
77 DISALLOW_COPY_AND_ASSIGN(NetworkListView); 75 DISALLOW_COPY_AND_ASSIGN(NetworkListView);
78 }; 76 };
79 77
80 } // namespace ui 78 } // namespace ash
81 79
82 #endif // UI_CHROMEOS_NETWORK_NETWORK_LIST_H_ 80 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_NETWORK_LIST_H_
OLDNEW
« no previous file with comments | « ash/common/system/chromeos/network/network_info.cc ('k') | ash/common/system/chromeos/network/network_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698