| 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 <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 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 | 149 |
| 150 std::string NetworkScreen::GetLanguageListLocale() const { | 150 std::string NetworkScreen::GetLanguageListLocale() const { |
| 151 return language_list_locale_; | 151 return language_list_locale_; |
| 152 } | 152 } |
| 153 | 153 |
| 154 const base::ListValue* NetworkScreen::GetLanguageList() const { | 154 const base::ListValue* NetworkScreen::GetLanguageList() const { |
| 155 return language_list_.get(); | 155 return language_list_.get(); |
| 156 } | 156 } |
| 157 | 157 |
| 158 void NetworkScreen::UpdateLanguageList() { | 158 void NetworkScreen::UpdateLanguageList() { |
| 159 ScheduleResolveLanguageList(scoped_ptr<locale_util::LanguageSwitchResult>()); | 159 ScheduleResolveLanguageList( |
| 160 std::unique_ptr<locale_util::LanguageSwitchResult>()); |
| 160 } | 161 } |
| 161 | 162 |
| 162 //////////////////////////////////////////////////////////////////////////////// | 163 //////////////////////////////////////////////////////////////////////////////// |
| 163 // NetworkScreen, NetworkStateHandlerObserver implementation: | 164 // NetworkScreen, NetworkStateHandlerObserver implementation: |
| 164 | 165 |
| 165 void NetworkScreen::NetworkConnectionStateChanged(const NetworkState* network) { | 166 void NetworkScreen::NetworkConnectionStateChanged(const NetworkState* network) { |
| 166 UpdateStatus(); | 167 UpdateStatus(); |
| 167 } | 168 } |
| 168 | 169 |
| 169 void NetworkScreen::DefaultNetworkChanged(const NetworkState* network) { | 170 void NetworkScreen::DefaultNetworkChanged(const NetworkState* network) { |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 const InputEventsBlocker* /* input_events_blocker */, | 403 const InputEventsBlocker* /* input_events_blocker */, |
| 403 const std::string& input_method, | 404 const std::string& input_method, |
| 404 const locale_util::LanguageSwitchResult& result) { | 405 const locale_util::LanguageSwitchResult& result) { |
| 405 if (!selected_language_code_.empty()) { | 406 if (!selected_language_code_.empty()) { |
| 406 // We still do not have device owner, so owner settings are not applied. | 407 // We still do not have device owner, so owner settings are not applied. |
| 407 // But Guest session can be started before owner is created, so we need to | 408 // But Guest session can be started before owner is created, so we need to |
| 408 // save locale settings directly here. | 409 // save locale settings directly here. |
| 409 g_browser_process->local_state()->SetString(prefs::kApplicationLocale, | 410 g_browser_process->local_state()->SetString(prefs::kApplicationLocale, |
| 410 selected_language_code_); | 411 selected_language_code_); |
| 411 } | 412 } |
| 412 ScheduleResolveLanguageList(scoped_ptr<locale_util::LanguageSwitchResult>( | 413 ScheduleResolveLanguageList( |
| 413 new locale_util::LanguageSwitchResult(result))); | 414 std::unique_ptr<locale_util::LanguageSwitchResult>( |
| 415 new locale_util::LanguageSwitchResult(result))); |
| 414 | 416 |
| 415 AccessibilityManager::Get()->OnLocaleChanged(); | 417 AccessibilityManager::Get()->OnLocaleChanged(); |
| 416 SetInputMethod(input_method); | 418 SetInputMethod(input_method); |
| 417 } | 419 } |
| 418 | 420 |
| 419 void NetworkScreen::ScheduleResolveLanguageList( | 421 void NetworkScreen::ScheduleResolveLanguageList( |
| 420 scoped_ptr<locale_util::LanguageSwitchResult> language_switch_result) { | 422 std::unique_ptr<locale_util::LanguageSwitchResult> language_switch_result) { |
| 421 UILanguageListResolvedCallback callback = base::Bind( | 423 UILanguageListResolvedCallback callback = base::Bind( |
| 422 &NetworkScreen::OnLanguageListResolved, weak_factory_.GetWeakPtr()); | 424 &NetworkScreen::OnLanguageListResolved, weak_factory_.GetWeakPtr()); |
| 423 ResolveUILanguageList(std::move(language_switch_result), callback); | 425 ResolveUILanguageList(std::move(language_switch_result), callback); |
| 424 } | 426 } |
| 425 | 427 |
| 426 void NetworkScreen::OnLanguageListResolved( | 428 void NetworkScreen::OnLanguageListResolved( |
| 427 scoped_ptr<base::ListValue> new_language_list, | 429 std::unique_ptr<base::ListValue> new_language_list, |
| 428 const std::string& new_language_list_locale, | 430 const std::string& new_language_list_locale, |
| 429 const std::string& new_selected_language) { | 431 const std::string& new_selected_language) { |
| 430 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 432 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
| 431 | 433 |
| 432 language_list_.reset(new_language_list.release()); | 434 language_list_.reset(new_language_list.release()); |
| 433 language_list_locale_ = new_language_list_locale; | 435 language_list_locale_ = new_language_list_locale; |
| 434 selected_language_code_ = new_selected_language; | 436 selected_language_code_ = new_selected_language; |
| 435 | 437 |
| 436 g_browser_process->local_state()->SetString(prefs::kApplicationLocale, | 438 g_browser_process->local_state()->SetString(prefs::kApplicationLocale, |
| 437 selected_language_code_); | 439 selected_language_code_); |
| 438 if (view_) | 440 if (view_) |
| 439 view_->ReloadLocalizedContent(); | 441 view_->ReloadLocalizedContent(); |
| 440 FOR_EACH_OBSERVER(Observer, observers_, OnLanguageListReloaded()); | 442 FOR_EACH_OBSERVER(Observer, observers_, OnLanguageListReloaded()); |
| 441 } | 443 } |
| 442 | 444 |
| 443 void NetworkScreen::OnSystemTimezoneChanged() { | 445 void NetworkScreen::OnSystemTimezoneChanged() { |
| 444 std::string current_timezone_id; | 446 std::string current_timezone_id; |
| 445 CrosSettings::Get()->GetString(kSystemTimezone, ¤t_timezone_id); | 447 CrosSettings::Get()->GetString(kSystemTimezone, ¤t_timezone_id); |
| 446 GetContextEditor().SetString(kContextKeyTimezone, current_timezone_id); | 448 GetContextEditor().SetString(kContextKeyTimezone, current_timezone_id); |
| 447 } | 449 } |
| 448 | 450 |
| 449 } // namespace chromeos | 451 } // namespace chromeos |
| OLD | NEW |