OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
81 #include "chromeos/cert_loader.h" | 81 #include "chromeos/cert_loader.h" |
82 #include "chromeos/chromeos_paths.h" | 82 #include "chromeos/chromeos_paths.h" |
83 #include "chromeos/chromeos_switches.h" | 83 #include "chromeos/chromeos_switches.h" |
84 #include "chromeos/cryptohome/async_method_caller.h" | 84 #include "chromeos/cryptohome/async_method_caller.h" |
85 #include "chromeos/cryptohome/homedir_methods.h" | 85 #include "chromeos/cryptohome/homedir_methods.h" |
86 #include "chromeos/cryptohome/system_salt_getter.h" | 86 #include "chromeos/cryptohome/system_salt_getter.h" |
87 #include "chromeos/dbus/dbus_thread_manager.h" | 87 #include "chromeos/dbus/dbus_thread_manager.h" |
88 #include "chromeos/dbus/power_policy_controller.h" | 88 #include "chromeos/dbus/power_policy_controller.h" |
89 #include "chromeos/dbus/session_manager_client.h" | 89 #include "chromeos/dbus/session_manager_client.h" |
90 #include "chromeos/disks/disk_mount_manager.h" | 90 #include "chromeos/disks/disk_mount_manager.h" |
| 91 #include "chromeos/ime/ime_keyboard.h" |
91 #include "chromeos/ime/input_method_manager.h" | 92 #include "chromeos/ime/input_method_manager.h" |
92 #include "chromeos/ime/xkeyboard.h" | |
93 #include "chromeos/login/login_state.h" | 93 #include "chromeos/login/login_state.h" |
94 #include "chromeos/network/network_change_notifier_chromeos.h" | 94 #include "chromeos/network/network_change_notifier_chromeos.h" |
95 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 95 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
96 #include "chromeos/network/network_handler.h" | 96 #include "chromeos/network/network_handler.h" |
97 #include "chromeos/system/statistics_provider.h" | 97 #include "chromeos/system/statistics_provider.h" |
98 #include "chromeos/tpm_token_loader.h" | 98 #include "chromeos/tpm_token_loader.h" |
99 #include "content/public/browser/browser_thread.h" | 99 #include "content/public/browser/browser_thread.h" |
100 #include "content/public/browser/notification_service.h" | 100 #include "content/public/browser/notification_service.h" |
101 #include "content/public/browser/power_save_blocker.h" | 101 #include "content/public/browser/power_save_blocker.h" |
102 #include "content/public/common/main_function_params.h" | 102 #include "content/public/common/main_function_params.h" |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
282 // change notifier starts to monitor changes from the power manager and | 282 // change notifier starts to monitor changes from the power manager and |
283 // the network manager. | 283 // the network manager. |
284 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); | 284 NetworkChangeNotifierFactoryChromeos::GetInstance()->Initialize(); |
285 | 285 |
286 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade | 286 // Likewise, initialize the upgrade detector for Chrome OS. The upgrade |
287 // detector starts to monitor changes from the update engine. | 287 // detector starts to monitor changes from the update engine. |
288 UpgradeDetectorChromeos::GetInstance()->Init(); | 288 UpgradeDetectorChromeos::GetInstance()->Init(); |
289 | 289 |
290 if (base::SysInfo::IsRunningOnChromeOS()) { | 290 if (base::SysInfo::IsRunningOnChromeOS()) { |
291 // Disable Num Lock on X start up for http://crosbug.com/29169. | 291 // Disable Num Lock on X start up for http://crosbug.com/29169. |
292 input_method::InputMethodManager::Get()->GetXKeyboard()->DisableNumLock(); | 292 input_method::InputMethodManager::Get() |
| 293 ->GetImeKeyboard() |
| 294 ->DisableNumLock(); |
293 } | 295 } |
294 | 296 |
295 // Initialize the device settings service so that we'll take actions per | 297 // Initialize the device settings service so that we'll take actions per |
296 // signals sent from the session manager. This needs to happen before | 298 // signals sent from the session manager. This needs to happen before |
297 // g_browser_process initializes BrowserPolicyConnector. | 299 // g_browser_process initializes BrowserPolicyConnector. |
298 DeviceSettingsService::Initialize(); | 300 DeviceSettingsService::Initialize(); |
299 DeviceSettingsService::Get()->SetSessionManager( | 301 DeviceSettingsService::Get()->SetSessionManager( |
300 DBusThreadManager::Get()->GetSessionManagerClient(), | 302 DBusThreadManager::Get()->GetSessionManagerClient(), |
301 OwnerKeyUtil::Create()); | 303 OwnerKeyUtil::Create()); |
302 } | 304 } |
(...skipping 532 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
835 // Destroy DBus services immediately after threads are stopped. | 837 // Destroy DBus services immediately after threads are stopped. |
836 dbus_services_.reset(); | 838 dbus_services_.reset(); |
837 | 839 |
838 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 840 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
839 | 841 |
840 // Destroy DeviceSettingsService after g_browser_process. | 842 // Destroy DeviceSettingsService after g_browser_process. |
841 DeviceSettingsService::Shutdown(); | 843 DeviceSettingsService::Shutdown(); |
842 } | 844 } |
843 | 845 |
844 } // namespace chromeos | 846 } // namespace chromeos |
OLD | NEW |