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

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

Issue 2835133002: ash: Remove NetworkDetailedView. (Closed)
Patch Set: Fix compile error. Created 3 years, 8 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 (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_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_ 5 #ifndef ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
6 #define ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_ 6 #define ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "ash/login_status.h" 11 #include "ash/login_status.h"
12 #include "ash/system/network/network_detailed_view.h"
13 #include "ash/system/network/network_list_delegate.h" 12 #include "ash/system/network/network_list_delegate.h"
13 #include "ash/system/tray/tray_details_view.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "ui/gfx/image/image.h" 16 #include "ui/gfx/image/image.h"
17 #include "ui/views/controls/button/button.h" 17 #include "ui/views/controls/button/button.h"
18 #include "ui/views/controls/button/custom_button.h" 18 #include "ui/views/controls/button/custom_button.h"
19 19
20 namespace chromeos { 20 namespace chromeos {
21 class NetworkTypePattern; 21 class NetworkTypePattern;
22 } 22 }
23 23
24 namespace ash { 24 namespace ash {
25 class NetworkListViewBase; 25 class NetworkListViewBase;
26 } 26 }
27 27
28 namespace views { 28 namespace views {
29 class BubbleDialogDelegateView; 29 class BubbleDialogDelegateView;
30 } 30 }
31 31
32 namespace ash { 32 namespace ash {
33 class SystemTrayItem; 33 class SystemTrayItem;
34 34
35 namespace tray { 35 namespace tray {
36 36
37 class NetworkStateListDetailedView 37 class NetworkStateListDetailedView
38 : public NetworkDetailedView, 38 : public TrayDetailsView,
39 public NetworkListDelegate, 39 public NetworkListDelegate,
40 public base::SupportsWeakPtr<NetworkStateListDetailedView> { 40 public base::SupportsWeakPtr<NetworkStateListDetailedView> {
41 public: 41 public:
42 enum ListType { LIST_TYPE_NETWORK, LIST_TYPE_VPN }; 42 enum ListType { LIST_TYPE_NETWORK, LIST_TYPE_VPN };
43 43
44 NetworkStateListDetailedView(SystemTrayItem* owner, 44 NetworkStateListDetailedView(SystemTrayItem* owner,
45 ListType list_type, 45 ListType list_type,
46 LoginStatus login); 46 LoginStatus login);
47 ~NetworkStateListDetailedView() override; 47 ~NetworkStateListDetailedView() override;
48 48
49 // Overridden from NetworkDetailedView: 49 void Init();
50 void Init() override; 50 void Update();
tdanderson 2017/04/25 14:52:22 nit: please move the deleted function-level docume
tetsui2 2017/04/26 00:04:37 Done.
51 DetailedViewType GetViewType() const override;
52 void Update() override;
53 51
54 private: 52 private:
55 class InfoBubble; 53 class InfoBubble;
56 54
57 // TrayDetailsView: 55 // TrayDetailsView:
58 void HandleViewClicked(views::View* view) override; 56 void HandleViewClicked(views::View* view) override;
59 void HandleButtonPressed(views::Button* sender, 57 void HandleButtonPressed(views::Button* sender,
60 const ui::Event& event) override; 58 const ui::Event& event) override;
61 void CreateExtraTitleRowButtons() override; 59 void CreateExtraTitleRowButtons() override;
62 60
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 104
107 std::unique_ptr<NetworkListViewBase> network_list_view_; 105 std::unique_ptr<NetworkListViewBase> network_list_view_;
108 106
109 DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView); 107 DISALLOW_COPY_AND_ASSIGN(NetworkStateListDetailedView);
110 }; 108 };
111 109
112 } // namespace tray 110 } // namespace tray
113 } // namespace ash 111 } // namespace ash
114 112
115 #endif // ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_ 113 #endif // ASH_SYSTEM_NETWORK_NETWORK_STATE_LIST_DETAILED_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698