| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/base_login_display_host.h" | 5 #include "chrome/browser/chromeos/login/base_login_display_host.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/threading/thread_restrictions.h" | 10 #include "base/threading/thread_restrictions.h" |
| 11 #include "chrome/browser/browser_process.h" | 11 #include "chrome/browser/browser_process.h" |
| 12 #include "chrome/browser/chromeos/cros/cros_library.h" | 12 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 13 #include "chrome/browser/chromeos/cros/login_library.h" | 13 #include "chrome/browser/chromeos/cros/login_library.h" |
| 14 #include "chrome/browser/chromeos/customization_document.h" | 14 #include "chrome/browser/chromeos/customization_document.h" |
| 15 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 15 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
| 16 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 16 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 17 #include "chrome/browser/chromeos/language_preferences.h" | 17 #include "chrome/browser/chromeos/language_preferences.h" |
| 18 #include "chrome/browser/chromeos/login/existing_user_controller.h" | 18 #include "chrome/browser/chromeos/login/existing_user_controller.h" |
| 19 #include "chrome/browser/chromeos/login/helper.h" | 19 #include "chrome/browser/chromeos/login/helper.h" |
| 20 #include "chrome/browser/chromeos/login/language_switch_menu.h" | 20 #include "chrome/browser/chromeos/login/language_switch_menu.h" |
| 21 #include "chrome/browser/chromeos/login/login_utils.h" | 21 #include "chrome/browser/chromeos/login/login_utils.h" |
| 22 #include "chrome/browser/chromeos/login/user_manager.h" | 22 #include "chrome/browser/chromeos/login/user_manager.h" |
| 23 #include "chrome/browser/chromeos/login/views_login_display_host.h" | 23 #include "chrome/browser/chromeos/login/views_login_display_host.h" |
| 24 #include "chrome/browser/chromeos/login/webui_login_display_host.h" | 24 #include "chrome/browser/chromeos/login/webui_login_display_host.h" |
| 25 #include "chrome/browser/chromeos/login/wizard_controller.h" | 25 #include "chrome/browser/chromeos/login/wizard_controller.h" |
| 26 #include "chrome/browser/chromeos/system_access.h" | 26 #include "chrome/browser/chromeos/system/timezone_settings.h" |
| 27 #include "chrome/browser/chromeos/wm_ipc.h" | 27 #include "chrome/browser/chromeos/wm_ipc.h" |
| 28 #include "chrome/browser/policy/browser_policy_connector.h" | 28 #include "chrome/browser/policy/browser_policy_connector.h" |
| 29 #include "chrome/browser/prefs/pref_service.h" | 29 #include "chrome/browser/prefs/pref_service.h" |
| 30 #include "chrome/common/pref_names.h" | 30 #include "chrome/common/pref_names.h" |
| 31 #include "content/common/notification_service.h" | 31 #include "content/common/notification_service.h" |
| 32 #include "content/common/notification_type.h" | 32 #include "content/common/notification_type.h" |
| 33 #include "googleurl/src/gurl.h" | 33 #include "googleurl/src/gurl.h" |
| 34 #include "third_party/cros/chromeos_wm_ipc_enums.h" | 34 #include "third_party/cros/chromeos_wm_ipc_enums.h" |
| 35 #include "ui/base/resource/resource_bundle.h" | 35 #include "ui/base/resource/resource_bundle.h" |
| 36 #include "unicode/timezone.h" | 36 #include "unicode/timezone.h" |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 if (startup_manifest->IsReady()) { | 318 if (startup_manifest->IsReady()) { |
| 319 // Set initial timezone if specified by customization. | 319 // Set initial timezone if specified by customization. |
| 320 const std::string timezone_name = startup_manifest->initial_timezone(); | 320 const std::string timezone_name = startup_manifest->initial_timezone(); |
| 321 VLOG(1) << "Initial time zone: " << timezone_name; | 321 VLOG(1) << "Initial time zone: " << timezone_name; |
| 322 // Apply locale customizations only once so preserve whatever locale | 322 // Apply locale customizations only once so preserve whatever locale |
| 323 // user has changed to during OOBE. | 323 // user has changed to during OOBE. |
| 324 if (!timezone_name.empty()) { | 324 if (!timezone_name.empty()) { |
| 325 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( | 325 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( |
| 326 icu::UnicodeString::fromUTF8(timezone_name)); | 326 icu::UnicodeString::fromUTF8(timezone_name)); |
| 327 CHECK(timezone) << "Timezone could not be set for " << timezone_name; | 327 CHECK(timezone) << "Timezone could not be set for " << timezone_name; |
| 328 chromeos::SystemAccess::GetInstance()->SetTimezone(*timezone); | 328 chromeos::system::TimezoneSettings::GetInstance()->SetTimezone(*timezone); |
| 329 } | 329 } |
| 330 } | 330 } |
| 331 } | 331 } |
| 332 | 332 |
| 333 } // namespace browser | 333 } // namespace browser |
| OLD | NEW |