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

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

Issue 2890383003: Bootstrapping: Send meaningful error code/message from Slave to Master (Closed)
Patch Set: . 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 #include "chrome/browser/chromeos/login/screens/network_screen.h" 5 #include "chrome/browser/chromeos/login/screens/network_screen.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 void NetworkScreen::GetConnectedWifiNetwork(std::string* out_onc_spec) { 147 void NetworkScreen::GetConnectedWifiNetwork(std::string* out_onc_spec) {
148 // Currently We can only transfer unsecured WiFi configuration from shark to 148 // Currently We can only transfer unsecured WiFi configuration from shark to
149 // remora. There is no way to get password for a secured Wifi network in Cros 149 // remora. There is no way to get password for a secured Wifi network in Cros
150 // for security reasons. 150 // for security reasons.
151 network_state_helper_->GetConnectedWifiNetwork(out_onc_spec); 151 network_state_helper_->GetConnectedWifiNetwork(out_onc_spec);
152 } 152 }
153 153
154 void NetworkScreen::CreateAndConnectNetworkFromOnc( 154 void NetworkScreen::CreateAndConnectNetworkFromOnc(
155 const std::string& onc_spec, 155 const std::string& onc_spec,
156 const base::Closure& success_callback, 156 const base::Closure& success_callback,
157 const base::Closure& failed_callback) { 157 const network_handler::ErrorCallback& error_callback) {
158 network_state_helper_->CreateAndConnectNetworkFromOnc( 158 network_state_helper_->CreateAndConnectNetworkFromOnc(
159 onc_spec, success_callback, failed_callback); 159 onc_spec, success_callback, error_callback);
160 } 160 }
161 161
162 void NetworkScreen::AddObserver(Observer* observer) { 162 void NetworkScreen::AddObserver(Observer* observer) {
163 if (observer) 163 if (observer)
164 observers_.AddObserver(observer); 164 observers_.AddObserver(observer);
165 } 165 }
166 166
167 void NetworkScreen::RemoveObserver(Observer* observer) { 167 void NetworkScreen::RemoveObserver(Observer* observer) {
168 if (observer) 168 if (observer)
169 observers_.RemoveObserver(observer); 169 observers_.RemoveObserver(observer);
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 observer.OnLanguageListReloaded(); 441 observer.OnLanguageListReloaded();
442 } 442 }
443 443
444 void NetworkScreen::OnSystemTimezoneChanged() { 444 void NetworkScreen::OnSystemTimezoneChanged() {
445 std::string current_timezone_id; 445 std::string current_timezone_id;
446 CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id); 446 CrosSettings::Get()->GetString(kSystemTimezone, &current_timezone_id);
447 GetContextEditor().SetString(kContextKeyTimezone, current_timezone_id); 447 GetContextEditor().SetString(kContextKeyTimezone, current_timezone_id);
448 } 448 }
449 449
450 } // namespace chromeos 450 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698