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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 #include "chromeos/dbus/dbus_thread_manager.h" | 105 #include "chromeos/dbus/dbus_thread_manager.h" |
106 #include "chromeos/dbus/power_policy_controller.h" | 106 #include "chromeos/dbus/power_policy_controller.h" |
107 #include "chromeos/dbus/services/console_service_provider.h" | 107 #include "chromeos/dbus/services/console_service_provider.h" |
108 #include "chromeos/dbus/services/cros_dbus_service.h" | 108 #include "chromeos/dbus/services/cros_dbus_service.h" |
109 #include "chromeos/dbus/services/display_power_service_provider.h" | 109 #include "chromeos/dbus/services/display_power_service_provider.h" |
110 #include "chromeos/dbus/services/liveness_service_provider.h" | 110 #include "chromeos/dbus/services/liveness_service_provider.h" |
111 #include "chromeos/dbus/services/proxy_resolution_service_provider.h" | 111 #include "chromeos/dbus/services/proxy_resolution_service_provider.h" |
112 #include "chromeos/dbus/session_manager_client.h" | 112 #include "chromeos/dbus/session_manager_client.h" |
113 #include "chromeos/disks/disk_mount_manager.h" | 113 #include "chromeos/disks/disk_mount_manager.h" |
114 #include "chromeos/login/login_state.h" | 114 #include "chromeos/login/login_state.h" |
115 #include "chromeos/login/user_names.h" | |
116 #include "chromeos/login_event_recorder.h" | 115 #include "chromeos/login_event_recorder.h" |
117 #include "chromeos/network/network_change_notifier_chromeos.h" | 116 #include "chromeos/network/network_change_notifier_chromeos.h" |
118 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 117 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
119 #include "chromeos/network/network_handler.h" | 118 #include "chromeos/network/network_handler.h" |
120 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" | 119 #include "chromeos/network/portal_detector/network_portal_detector_stub.h" |
121 #include "chromeos/system/statistics_provider.h" | 120 #include "chromeos/system/statistics_provider.h" |
122 #include "chromeos/tpm/tpm_token_loader.h" | 121 #include "chromeos/tpm/tpm_token_loader.h" |
123 #include "components/browser_sync/browser_sync_switches.h" | 122 #include "components/browser_sync/browser_sync_switches.h" |
124 #include "components/device_event_log/device_event_log.h" | 123 #include "components/device_event_log/device_event_log.h" |
125 #include "components/metrics/metrics_service.h" | 124 #include "components/metrics/metrics_service.h" |
126 #include "components/ownership/owner_key_util.h" | 125 #include "components/ownership/owner_key_util.h" |
127 #include "components/prefs/pref_service.h" | 126 #include "components/prefs/pref_service.h" |
128 #include "components/session_manager/core/session_manager.h" | 127 #include "components/session_manager/core/session_manager.h" |
129 #include "components/signin/core/account_id/account_id.h" | 128 #include "components/signin/core/account_id/account_id.h" |
130 #include "components/user_manager/user.h" | 129 #include "components/user_manager/user.h" |
131 #include "components/user_manager/user_manager.h" | 130 #include "components/user_manager/user_manager.h" |
| 131 #include "components/user_manager/user_names.h" |
132 #include "components/wallpaper/wallpaper_manager_base.h" | 132 #include "components/wallpaper/wallpaper_manager_base.h" |
133 #include "content/public/browser/browser_thread.h" | 133 #include "content/public/browser/browser_thread.h" |
134 #include "content/public/browser/notification_service.h" | 134 #include "content/public/browser/notification_service.h" |
135 #include "content/public/common/content_switches.h" | 135 #include "content/public/common/content_switches.h" |
136 #include "content/public/common/main_function_params.h" | 136 #include "content/public/common/main_function_params.h" |
137 #include "device/bluetooth/bluetooth_adapter_factory.h" | 137 #include "device/bluetooth/bluetooth_adapter_factory.h" |
138 #include "device/bluetooth/dbus/bluez_dbus_manager.h" | 138 #include "device/bluetooth/dbus/bluez_dbus_manager.h" |
139 #include "media/audio/sounds/sounds_manager.h" | 139 #include "media/audio/sounds/sounds_manager.h" |
140 #include "net/base/network_change_notifier.h" | 140 #include "net/base/network_change_notifier.h" |
141 #include "net/url_request/url_request.h" | 141 #include "net/url_request/url_request.h" |
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 | 325 |
326 // If we're not running on real Chrome OS hardware (or under VM), and are not | 326 // If we're not running on real Chrome OS hardware (or under VM), and are not |
327 // showing the login manager or attempting a command line login, login with a | 327 // showing the login manager or attempting a command line login, login with a |
328 // stub user. | 328 // stub user. |
329 if (!base::SysInfo::IsRunningOnChromeOS() && | 329 if (!base::SysInfo::IsRunningOnChromeOS() && |
330 !parsed_command_line().HasSwitch(switches::kLoginManager) && | 330 !parsed_command_line().HasSwitch(switches::kLoginManager) && |
331 !parsed_command_line().HasSwitch(switches::kLoginUser) && | 331 !parsed_command_line().HasSwitch(switches::kLoginUser) && |
332 !parsed_command_line().HasSwitch(switches::kGuestSession)) { | 332 !parsed_command_line().HasSwitch(switches::kGuestSession)) { |
333 singleton_command_line->AppendSwitchASCII( | 333 singleton_command_line->AppendSwitchASCII( |
334 switches::kLoginUser, | 334 switches::kLoginUser, |
335 cryptohome::Identification(login::StubAccountId()).id()); | 335 cryptohome::Identification(user_manager::StubAccountId()).id()); |
336 if (!parsed_command_line().HasSwitch(switches::kLoginProfile)) { | 336 if (!parsed_command_line().HasSwitch(switches::kLoginProfile)) { |
337 singleton_command_line->AppendSwitchASCII(switches::kLoginProfile, | 337 singleton_command_line->AppendSwitchASCII(switches::kLoginProfile, |
338 chrome::kTestUserProfileDir); | 338 chrome::kTestUserProfileDir); |
339 } | 339 } |
340 LOG(WARNING) << "Running as stub user with profile dir: " | 340 LOG(WARNING) << "Running as stub user with profile dir: " |
341 << singleton_command_line->GetSwitchValuePath( | 341 << singleton_command_line->GetSwitchValuePath( |
342 switches::kLoginProfile).value(); | 342 switches::kLoginProfile).value(); |
343 } | 343 } |
344 | 344 |
345 #if defined(GOOGLE_CHROME_BUILD) | 345 #if defined(GOOGLE_CHROME_BUILD) |
(...skipping 540 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
886 // Destroy DBus services immediately after threads are stopped. | 886 // Destroy DBus services immediately after threads are stopped. |
887 dbus_services_.reset(); | 887 dbus_services_.reset(); |
888 | 888 |
889 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 889 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
890 | 890 |
891 // Destroy DeviceSettingsService after g_browser_process. | 891 // Destroy DeviceSettingsService after g_browser_process. |
892 DeviceSettingsService::Shutdown(); | 892 DeviceSettingsService::Shutdown(); |
893 } | 893 } |
894 | 894 |
895 } // namespace chromeos | 895 } // namespace chromeos |
OLD | NEW |