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

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

Issue 2698473007: Convert path usage in NetworkListViewBase subclasses to use guids. (Closed)
Patch Set: Tweak NetworkPortalNotificationControllerTest to create GUIDs for new NetworkStates. Created 3 years, 10 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_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 28 matching lines...) Expand all
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; 42 void UpdateAfterLoginStatusChange(LoginStatus status) override;
43 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override; 43 void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
44 44
45 // NetworkObserver 45 // NetworkObserver
46 void RequestToggleWifi() override; 46 void RequestToggleWifi() override;
47 47
48 // NetworkPortalDetectorObserver 48 // NetworkPortalDetectorObserver
49 void OnCaptivePortalDetected(const std::string& service_path) override; 49 void OnCaptivePortalDetected(const std::string& guid) override;
50 50
51 // TrayNetworkStateObserver::Delegate 51 // TrayNetworkStateObserver::Delegate
52 void NetworkStateChanged() override; 52 void NetworkStateChanged() override;
53 53
54 private: 54 private:
55 tray::NetworkTrayView* tray_; 55 tray::NetworkTrayView* tray_;
56 tray::NetworkDefaultView* default_; 56 tray::NetworkDefaultView* default_;
57 tray::NetworkDetailedView* detailed_; 57 tray::NetworkDetailedView* detailed_;
58 bool request_wifi_view_; 58 bool request_wifi_view_;
59 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_; 59 std::unique_ptr<TrayNetworkStateObserver> network_state_observer_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(TrayNetwork); 61 DISALLOW_COPY_AND_ASSIGN(TrayNetwork);
62 }; 62 };
63 63
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_ 66 #endif // ASH_COMMON_SYSTEM_CHROMEOS_NETWORK_TRAY_NETWORK_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698