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

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

Issue 1519883003: 1) Add basic configuration (network connection, language, keyboard layout, timezone) setup page. 2)… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the i18n-content HTML format in the html files Created 5 years 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 "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/gtest_prod_util.h" 9 #include "base/gtest_prod_util.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 const std::string& input_method); 87 const std::string& input_method);
88 std::string GetApplicationLocale(); 88 std::string GetApplicationLocale();
89 std::string GetInputMethod() const; 89 std::string GetInputMethod() const;
90 90
91 void SetTimezone(const std::string& timezone_id); 91 void SetTimezone(const std::string& timezone_id);
92 std::string GetTimezone() const; 92 std::string GetTimezone() const;
93 93
94 // Currently We can only get unsecured Wifi network configuration from shark 94 // Currently We can only get unsecured Wifi network configuration from shark
95 // that can be applied to remora. Returns the network ONC configuration. 95 // that can be applied to remora. Returns the network ONC configuration.
96 void GetConnectedWifiNetwork(std::string* out_onc_spec); 96 void GetConnectedWifiNetwork(std::string* out_onc_spec);
97 void CreateAndConnectNetworkFromOnc(const std::string& onc_spec); 97 void CreateAndConnectNetworkFromOnc(const std::string& onc_spec,
98 const base::Closure& success_callback,
99 const base::Closure& failed_callback);
98 100
99 void AddObserver(Observer* observer); 101 void AddObserver(Observer* observer);
100 void RemoveObserver(Observer* observer); 102 void RemoveObserver(Observer* observer);
101 103
102 private: 104 private:
103 friend class NetworkScreenTest; 105 friend class NetworkScreenTest;
104 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, Timeout); 106 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, Timeout);
105 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, CanConnect); 107 FRIEND_TEST_ALL_PREFIXES(NetworkScreenTest, CanConnect);
106 108
107 void SetApplicationLocale(const std::string& locale); 109 void SetApplicationLocale(const std::string& locale);
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 scoped_ptr<locale_util::LanguageSwitchResult> language_switch_result); 155 scoped_ptr<locale_util::LanguageSwitchResult> language_switch_result);
154 156
155 // Callback for chromeos::ResolveUILanguageList() (from l10n_util). 157 // Callback for chromeos::ResolveUILanguageList() (from l10n_util).
156 void OnLanguageListResolved(scoped_ptr<base::ListValue> new_language_list, 158 void OnLanguageListResolved(scoped_ptr<base::ListValue> new_language_list,
157 const std::string& new_language_list_locale, 159 const std::string& new_language_list_locale,
158 const std::string& new_selected_language); 160 const std::string& new_selected_language);
159 161
160 // Callback when the system timezone settings is changed. 162 // Callback when the system timezone settings is changed.
161 void OnSystemTimezoneChanged(); 163 void OnSystemTimezoneChanged();
162 164
163 // Called when connection the network from ONC failed.
164 void OnConnectNetworkFromOncFailed();
165
166 // True if subscribed to network change notification. 165 // True if subscribed to network change notification.
167 bool is_network_subscribed_; 166 bool is_network_subscribed_;
168 167
169 // ID of the the network that we are waiting for. 168 // ID of the the network that we are waiting for.
170 base::string16 network_id_; 169 base::string16 network_id_;
171 170
172 // True if user pressed continue button so we should proceed with OOBE 171 // True if user pressed continue button so we should proceed with OOBE
173 // as soon as we are connected. 172 // as soon as we are connected.
174 bool continue_pressed_; 173 bool continue_pressed_;
175 174
(...skipping 20 matching lines...) Expand all
196 base::ObserverList<Observer> observers_; 195 base::ObserverList<Observer> observers_;
197 196
198 base::WeakPtrFactory<NetworkScreen> weak_factory_; 197 base::WeakPtrFactory<NetworkScreen> weak_factory_;
199 198
200 DISALLOW_COPY_AND_ASSIGN(NetworkScreen); 199 DISALLOW_COPY_AND_ASSIGN(NetworkScreen);
201 }; 200 };
202 201
203 } // namespace chromeos 202 } // namespace chromeos
204 203
205 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_ 204 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_NETWORK_SCREEN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698