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

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

Issue 2750263002: Remove ash tray utility functions that are no-ops in MD. (Closed)
Patch Set: Created 3 years, 9 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 | « no previous file | ash/common/system/chromeos/network/tray_network.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_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_ 5 #ifndef ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_
6 #define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_ 6 #define ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <set> 9 #include <set>
10 10
(...skipping 21 matching lines...) Expand all
32 32
33 tray::NetworkDetailedView* detailed() { return detailed_; } 33 tray::NetworkDetailedView* detailed() { return detailed_; }
34 34
35 // SystemTrayItem 35 // SystemTrayItem
36 views::View* CreateTrayView(LoginStatus status) override; 36 views::View* CreateTrayView(LoginStatus status) override;
37 views::View* CreateDefaultView(LoginStatus status) override; 37 views::View* CreateDefaultView(LoginStatus status) override;
38 views::View* CreateDetailedView(LoginStatus status) override; 38 views::View* CreateDetailedView(LoginStatus status) override;
39 void DestroyTrayView() override; 39 void DestroyTrayView() override;
40 void DestroyDefaultView() override; 40 void DestroyDefaultView() override;
41 void DestroyDetailedView() override; 41 void DestroyDetailedView() override;
42 void UpdateAfterLoginStatusChange(LoginStatus status) override;
43 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
44 42
45 // NetworkObserver 43 // NetworkObserver
46 void RequestToggleWifi() override; 44 void RequestToggleWifi() override;
47 45
48 // NetworkPortalDetectorObserver 46 // NetworkPortalDetectorObserver
49 void OnCaptivePortalDetected(const std::string& guid) override; 47 void OnCaptivePortalDetected(const std::string& guid) override;
50 48
51 // TrayNetworkStateObserver::Delegate 49 // TrayNetworkStateObserver::Delegate
52 void NetworkStateChanged() override; 50 void NetworkStateChanged() override;
53 51
54 private: 52 private:
55 tray::NetworkTrayView* tray_; 53 tray::NetworkTrayView* tray_;
56 tray::NetworkDefaultView* default_; 54 tray::NetworkDefaultView* default_;
57 tray::NetworkDetailedView* detailed_; 55 tray::NetworkDetailedView* detailed_;
58 bool request_wifi_view_; 56 bool request_wifi_view_;
59 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; 57 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_;
60 58
61 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 59 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
62 }; 60 };
63 61
64 } // namespace ash 62 } // namespace ash
65 63
66 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_ 64 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/chromeos/network/tray_network.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698