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

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

Issue 2807693002: Make LogoutButtonTray a regular View (Closed)
Patch Set: Rebased 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
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.cc ('k') | ash/system/network/tray_vpn.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_TRAY_VPN_H_ 5 #ifndef ASH_SYSTEM_NETWORK_TRAY_VPN_H_
6 #define ASH_SYSTEM_NETWORK_TRAY_VPN_H_ 6 #define ASH_SYSTEM_NETWORK_TRAY_VPN_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "ash/system/network/tray_network_state_observer.h" 10 #include "ash/system/network/tray_network_state_observer.h"
11 #include "ash/system/tray/system_tray_item.h" 11 #include "ash/system/tray/system_tray_item.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 13
14 namespace ash { 14 namespace ash {
15 class TrayNetworkStateObserver; 15 class TrayNetworkStateObserver;
16 16
17 namespace tray { 17 namespace tray {
18 class NetworkDetailedView; 18 class NetworkDetailedView;
19 class VpnDefaultView; 19 class VpnDefaultView;
20 } 20 }
21 21
22 class TrayVPN : public SystemTrayItem, 22 class TrayVPN : public SystemTrayItem,
23 public TrayNetworkStateObserver::Delegate { 23 public TrayNetworkStateObserver::Delegate {
24 public: 24 public:
25 explicit TrayVPN(SystemTray* system_tray); 25 explicit TrayVPN(SystemTray* system_tray);
26 ~TrayVPN() override; 26 ~TrayVPN() override;
27 27
28 // SystemTrayItem 28 // SystemTrayItem
29 views::View* CreateTrayView(LoginStatus status) override;
30 views::View* CreateDefaultView(LoginStatus status) override; 29 views::View* CreateDefaultView(LoginStatus status) override;
31 views::View* CreateDetailedView(LoginStatus status) override; 30 views::View* CreateDetailedView(LoginStatus status) override;
32 void DestroyTrayView() override;
33 void DestroyDefaultView() override; 31 void DestroyDefaultView() override;
34 void DestroyDetailedView() override; 32 void DestroyDetailedView() override;
35 void UpdateAfterLoginStatusChange(LoginStatus status) override;
36 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
37 33
38 // TrayNetworkStateObserver::Delegate 34 // TrayNetworkStateObserver::Delegate
39 void NetworkStateChanged() override; 35 void NetworkStateChanged() override;
40 36
41 private: 37 private:
42 tray::VpnDefaultView* default_; 38 tray::VpnDefaultView* default_;
43 tray::NetworkDetailedView* detailed_; 39 tray::NetworkDetailedView* detailed_;
44 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; 40 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_;
45 41
46 DISALLOW_COPY_AND_ASSIGN(TrayVPN); 42 DISALLOW_COPY_AND_ASSIGN(TrayVPN);
47 }; 43 };
48 44
49 } // namespace ash 45 } // namespace ash
50 46
51 #endif // ASH_SYSTEM_NETWORK_TRAY_VPN_H_ 47 #endif // ASH_SYSTEM_NETWORK_TRAY_VPN_H_
OLDNEW
« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.cc ('k') | ash/system/network/tray_vpn.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698