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/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/threading/thread_restrictions.h" | 9 #include "base/threading/thread_restrictions.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
(...skipping 25 matching lines...) Expand all Loading... |
36 #if defined(TOUCH_UI) | 36 #if defined(TOUCH_UI) |
37 #include "base/command_line.h" | 37 #include "base/command_line.h" |
38 #include "chrome/browser/chromeos/login/dom_login_display_host.h" | 38 #include "chrome/browser/chromeos/login/dom_login_display_host.h" |
39 #endif | 39 #endif |
40 | 40 |
41 namespace { | 41 namespace { |
42 | 42 |
43 // The delay of triggering initialization of the device policy subsystem | 43 // The delay of triggering initialization of the device policy subsystem |
44 // after the login screen is initialized. This makes sure that device policy | 44 // after the login screen is initialized. This makes sure that device policy |
45 // network requests are made while the system is idle waiting for user input. | 45 // network requests are made while the system is idle waiting for user input. |
46 const int kPolicyServiceInitializationDelayMilliseconds = 100; | 46 const int64 kPolicyServiceInitializationDelayMilliseconds = 100; |
47 | 47 |
48 // Determines the hardware keyboard from the given locale code | 48 // Determines the hardware keyboard from the given locale code |
49 // and the OEM layout information, and saves it to "Locale State". | 49 // and the OEM layout information, and saves it to "Locale State". |
50 // The information will be used in input_method::GetHardwareInputMethodId(). | 50 // The information will be used in input_method::GetHardwareInputMethodId(). |
51 void DetermineAndSaveHardwareKeyboard(const std::string& locale, | 51 void DetermineAndSaveHardwareKeyboard(const std::string& locale, |
52 const std::string& oem_layout) { | 52 const std::string& oem_layout) { |
53 std::string layout; | 53 std::string layout; |
54 if (!oem_layout.empty()) { | 54 if (!oem_layout.empty()) { |
55 // If the OEM layout information is provided, use it. | 55 // If the OEM layout information is provided, use it. |
56 layout = oem_layout; | 56 layout = oem_layout; |
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
300 if (!timezone_name.empty()) { | 300 if (!timezone_name.empty()) { |
301 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( | 301 icu::TimeZone* timezone = icu::TimeZone::createTimeZone( |
302 icu::UnicodeString::fromUTF8(timezone_name)); | 302 icu::UnicodeString::fromUTF8(timezone_name)); |
303 CHECK(timezone) << "Timezone could not be set for " << timezone_name; | 303 CHECK(timezone) << "Timezone could not be set for " << timezone_name; |
304 chromeos::SystemAccess::GetInstance()->SetTimezone(*timezone); | 304 chromeos::SystemAccess::GetInstance()->SetTimezone(*timezone); |
305 } | 305 } |
306 } | 306 } |
307 } | 307 } |
308 | 308 |
309 } // namespace browser | 309 } // namespace browser |
OLD | NEW |