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

Side by Side Diff: chrome/browser/chromeos/login/screens/network_screen.h

Issue 2824283003: Fix autoupdate_EndToEndTest on veyron_rialto (Closed)
Patch Set: Addressed more comments Created 3 years, 7 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 CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 void GetConnectedWifiNetwork(std::string* out_onc_spec); 88 void GetConnectedWifiNetwork(std::string* out_onc_spec);
89 void CreateAndConnectNetworkFromOnc(const std::string& onc_spec, 89 void CreateAndConnectNetworkFromOnc(const std::string& onc_spec,
90 const base::Closure& success_callback, 90 const base::Closure& success_callback,
91 const base::Closure& failed_callback); 91 const base::Closure& failed_callback);
92 92
93 void AddObserver(Observer* observer); 93 void AddObserver(Observer* observer);
94 void RemoveObserver(Observer* observer); 94 void RemoveObserver(Observer* observer);
95 95
96 private: 96 private:
97 friend class NetworkScreenTest; 97 friend class NetworkScreenTest;
98 friend class NetworkScreenUnitTest;
98 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, Timeout); 99 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, Timeout);
99 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, CanConnect); 100 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, CanConnect);
100 FRIEND_TEST_ALL_PREFIXES(HandsOffNetworkScreenTest, RequiresNoInput); 101 FRIEND_TEST_ALL_PREFIXES(NetworkScreenUnitTest, ContinuesAutomatically);
101 FRIEND_TEST_ALL_PREFIXES(HandsOffNetworkScreenTest, ContinueClickedOnlyOnce); 102 FRIEND_TEST_ALL_PREFIXES(NetworkScreenUnitTest, ContinuesOnlyOnce);
102 103
103 // BaseScreen implementation: 104 // BaseScreen implementation:
104 void Show() override; 105 void Show() override;
105 void Hide() override; 106 void Hide() override;
106 void OnUserAction(const std::string& action_id) override; 107 void OnUserAction(const std::string& action_id) override;
107 void OnContextKeyUpdated(const ::login::ScreenContext::KeyType& key) override; 108 void OnContextKeyUpdated(const ::login::ScreenContext::KeyType& key) override;
108 109
109 // NetworkStateHandlerObserver implementation: 110 // NetworkStateHandlerObserver implementation:
110 void NetworkConnectionStateChanged(const NetworkState* network) override; 111 void NetworkConnectionStateChanged(const NetworkState* network) override;
111 void DefaultNetworkChanged(const NetworkState* network) override; 112 void DefaultNetworkChanged(const NetworkState* network) override;
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 base::ObserverList<Observer> observers_; 213 base::ObserverList<Observer> observers_;
213 214
214 base::WeakPtrFactory<NetworkScreen> weak_factory_; 215 base::WeakPtrFactory<NetworkScreen> weak_factory_;
215 216
216 DISALLOW_COPY_AND_ASSIGN(NetworkScreen); 217 DISALLOW_COPY_AND_ASSIGN(NetworkScreen);
217 }; 218 };
218 219
219 } // namespace chromeos 220 } // namespace chromeos
220 221
221 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_ 222 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698