| 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/startup_utils.h" | 5 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 // static | 184 // static |
| 185 std::string StartupUtils::GetInitialLocale() { | 185 std::string StartupUtils::GetInitialLocale() { |
| 186 std::string locale = | 186 std::string locale = |
| 187 g_browser_process->local_state()->GetString(prefs::kInitialLocale); | 187 g_browser_process->local_state()->GetString(prefs::kInitialLocale); |
| 188 if (!l10n_util::IsValidLocaleSyntax(locale)) | 188 if (!l10n_util::IsValidLocaleSyntax(locale)) |
| 189 locale = "en-US"; | 189 locale = "en-US"; |
| 190 return locale; | 190 return locale; |
| 191 } | 191 } |
| 192 | 192 |
| 193 // static | 193 // static |
| 194 bool StartupUtils::IsWebviewSigninEnabled() { | |
| 195 return true; | |
| 196 } | |
| 197 | |
| 198 // static | |
| 199 void StartupUtils::SetInitialLocale(const std::string& locale) { | 194 void StartupUtils::SetInitialLocale(const std::string& locale) { |
| 200 if (l10n_util::IsValidLocaleSyntax(locale)) | 195 if (l10n_util::IsValidLocaleSyntax(locale)) |
| 201 SaveStringPreferenceForced(prefs::kInitialLocale, locale); | 196 SaveStringPreferenceForced(prefs::kInitialLocale, locale); |
| 202 else | 197 else |
| 203 NOTREACHED(); | 198 NOTREACHED(); |
| 204 } | 199 } |
| 205 | 200 |
| 206 } // namespace chromeos | 201 } // namespace chromeos |
| OLD | NEW |