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