Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/wizard_controller.h" | 5 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 6 | 6 |
| 7 #include <gdk/gdk.h> | 7 #include <gdk/gdk.h> |
| 8 #include <signal.h> | 8 #include <signal.h> |
| 9 #include <sys/types.h> | 9 #include <sys/types.h> |
| 10 | 10 |
| (...skipping 989 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1000 // chromeos::LanguageSwitchMenu::SwitchLanguage here before | 1000 // chromeos::LanguageSwitchMenu::SwitchLanguage here before |
| 1001 // EmitLoginPromptReady. | 1001 // EmitLoginPromptReady. |
| 1002 const std::string current_locale = | 1002 const std::string current_locale = |
| 1003 g_browser_process->local_state()->GetString( | 1003 g_browser_process->local_state()->GetString( |
| 1004 prefs::kApplicationLocale); | 1004 prefs::kApplicationLocale); |
| 1005 VLOG(1) << "Current locale: " << current_locale; | 1005 VLOG(1) << "Current locale: " << current_locale; |
| 1006 if (current_locale.empty()) { | 1006 if (current_locale.empty()) { |
| 1007 locale = controller->GetCustomization()->initial_locale(); | 1007 locale = controller->GetCustomization()->initial_locale(); |
| 1008 VLOG(1) << "Initial locale: " << locale; | 1008 VLOG(1) << "Initial locale: " << locale; |
| 1009 if (!locale.empty()) { | 1009 if (!locale.empty()) { |
| 1010 ResourceBundle::ReloadSharedInstance(locale); | 1010 CHECK(ResourceBundle::ReloadSharedInstance(locale) == locale) |
|
Peter Kasting
2010/12/20 17:18:48
Never do real work inside a CHECK or DCHECK.
glotov
2010/12/21 13:19:08
Done.
| |
| 1011 << "Locale could not be found for " << locale; | |
| 1011 } | 1012 } |
| 1012 } | 1013 } |
| 1013 } | 1014 } |
| 1014 | 1015 |
| 1015 controller->ShowBackground(screen_bounds); | 1016 controller->ShowBackground(screen_bounds); |
| 1016 controller->Init(first_screen_name, screen_bounds); | 1017 controller->Init(first_screen_name, screen_bounds); |
| 1017 controller->Show(); | 1018 controller->Show(); |
| 1018 | 1019 |
| 1019 chromeos::LoginUtils::Get()->PrewarmAuthentication(); | 1020 chromeos::LoginUtils::Get()->PrewarmAuthentication(); |
| 1020 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) | 1021 if (chromeos::CrosLibrary::Get()->EnsureLoaded()) |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 1032 // user has changed to during OOBE. | 1033 // user has changed to during OOBE. |
| 1033 if (!timezone_name.empty()) { | 1034 if (!timezone_name.empty()) { |
| 1034 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( | 1035 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( |
| 1035 icu::UnicodeString::fromUTF8(timezone_name)); | 1036 icu::UnicodeString::fromUTF8(timezone_name)); |
| 1036 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); | 1037 chromeos::CrosLibrary::Get()->GetSystemLibrary()->SetTimezone(timezone); |
| 1037 } | 1038 } |
| 1038 } | 1039 } |
| 1039 } | 1040 } |
| 1040 | 1041 |
| 1041 } // namespace browser | 1042 } // namespace browser |
| OLD | NEW |