| OLD | NEW | 
|---|
| 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 "base/location.h" | 7 #include "base/location.h" | 
| 8 #include "base/logging.h" | 8 #include "base/logging.h" | 
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" | 
| 10 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" | 
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 222 } | 222 } | 
| 223 | 223 | 
| 224 void NetworkScreen::GetConnectedWifiNetwork(std::string* out_onc_spec) { | 224 void NetworkScreen::GetConnectedWifiNetwork(std::string* out_onc_spec) { | 
| 225   // Currently We can only transfer unsecured WiFi configuration from shark to | 225   // Currently We can only transfer unsecured WiFi configuration from shark to | 
| 226   // remora. There is no way to get password for a secured Wifi network in Cros | 226   // remora. There is no way to get password for a secured Wifi network in Cros | 
| 227   // for security reasons. | 227   // for security reasons. | 
| 228   network_state_helper_->GetConnectedWifiNetwork(out_onc_spec); | 228   network_state_helper_->GetConnectedWifiNetwork(out_onc_spec); | 
| 229 } | 229 } | 
| 230 | 230 | 
| 231 void NetworkScreen::CreateAndConnectNetworkFromOnc( | 231 void NetworkScreen::CreateAndConnectNetworkFromOnc( | 
| 232     const std::string& onc_spec) { | 232     const std::string& onc_spec, | 
|  | 233     const base::Closure& success_callback, | 
|  | 234     const base::Closure& failed_callback) { | 
| 233   network_state_helper_->CreateAndConnectNetworkFromOnc( | 235   network_state_helper_->CreateAndConnectNetworkFromOnc( | 
| 234       onc_spec, base::Bind(&base::DoNothing), | 236       onc_spec, success_callback, failed_callback); | 
| 235       base::Bind(&NetworkScreen::OnConnectNetworkFromOncFailed, |  | 
| 236                  base::Unretained(this))); |  | 
| 237 } | 237 } | 
| 238 | 238 | 
| 239 void NetworkScreen::AddObserver(Observer* observer) { | 239 void NetworkScreen::AddObserver(Observer* observer) { | 
| 240   if (observer) | 240   if (observer) | 
| 241     observers_.AddObserver(observer); | 241     observers_.AddObserver(observer); | 
| 242 } | 242 } | 
| 243 | 243 | 
| 244 void NetworkScreen::RemoveObserver(Observer* observer) { | 244 void NetworkScreen::RemoveObserver(Observer* observer) { | 
| 245   if (observer) | 245   if (observer) | 
| 246     observers_.RemoveObserver(observer); | 246     observers_.RemoveObserver(observer); | 
| (...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 434     view_->ReloadLocalizedContent(); | 434     view_->ReloadLocalizedContent(); | 
| 435   FOR_EACH_OBSERVER(Observer, observers_, OnLanguageListReloaded()); | 435   FOR_EACH_OBSERVER(Observer, observers_, OnLanguageListReloaded()); | 
| 436 } | 436 } | 
| 437 | 437 | 
| 438 void NetworkScreen::OnSystemTimezoneChanged() { | 438 void NetworkScreen::OnSystemTimezoneChanged() { | 
| 439   std::string current_timezone_id; | 439   std::string current_timezone_id; | 
| 440   CrosSettings::Get()->GetString(kSystemTimezone, ¤t_timezone_id); | 440   CrosSettings::Get()->GetString(kSystemTimezone, ¤t_timezone_id); | 
| 441   GetContextEditor().SetString(kContextKeyTimezone, current_timezone_id); | 441   GetContextEditor().SetString(kContextKeyTimezone, current_timezone_id); | 
| 442 } | 442 } | 
| 443 | 443 | 
| 444 void NetworkScreen::OnConnectNetworkFromOncFailed() { |  | 
| 445   if (!network_state_helper_->IsConnected() && view_) { |  | 
| 446     // Show error bubble. |  | 
| 447     view_->ShowError(l10n_util::GetStringFUTF16( |  | 
| 448         IDS_NETWORK_SELECTION_ERROR, |  | 
| 449         l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME))); |  | 
| 450   } |  | 
| 451 } |  | 
| 452 |  | 
| 453 }  // namespace chromeos | 444 }  // namespace chromeos | 
| OLD | NEW | 
|---|