| 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 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 89 #include "chromeos/cryptohome/homedir_methods.h" | 89 #include "chromeos/cryptohome/homedir_methods.h" |
| 90 #include "chromeos/cryptohome/system_salt_getter.h" | 90 #include "chromeos/cryptohome/system_salt_getter.h" |
| 91 #include "chromeos/dbus/dbus_thread_manager.h" | 91 #include "chromeos/dbus/dbus_thread_manager.h" |
| 92 #include "chromeos/dbus/power_policy_controller.h" | 92 #include "chromeos/dbus/power_policy_controller.h" |
| 93 #include "chromeos/dbus/session_manager_client.h" | 93 #include "chromeos/dbus/session_manager_client.h" |
| 94 #include "chromeos/disks/disk_mount_manager.h" | 94 #include "chromeos/disks/disk_mount_manager.h" |
| 95 #include "chromeos/ime/ime_keyboard.h" | 95 #include "chromeos/ime/ime_keyboard.h" |
| 96 #include "chromeos/ime/input_method_manager.h" | 96 #include "chromeos/ime/input_method_manager.h" |
| 97 #include "chromeos/login/login_state.h" | 97 #include "chromeos/login/login_state.h" |
| 98 #include "chromeos/login/user_names.h" | 98 #include "chromeos/login/user_names.h" |
| 99 #include "chromeos/login_event_recorder.h" |
| 99 #include "chromeos/network/network_change_notifier_chromeos.h" | 100 #include "chromeos/network/network_change_notifier_chromeos.h" |
| 100 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 101 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
| 101 #include "chromeos/network/network_handler.h" | 102 #include "chromeos/network/network_handler.h" |
| 102 #include "chromeos/system/statistics_provider.h" | 103 #include "chromeos/system/statistics_provider.h" |
| 103 #include "chromeos/tpm_token_loader.h" | 104 #include "chromeos/tpm_token_loader.h" |
| 104 #include "components/metrics/metrics_service.h" | 105 #include "components/metrics/metrics_service.h" |
| 105 #include "components/session_manager/core/session_manager.h" | 106 #include "components/session_manager/core/session_manager.h" |
| 106 #include "components/user_manager/user.h" | 107 #include "components/user_manager/user.h" |
| 107 #include "content/public/browser/browser_thread.h" | 108 #include "content/public/browser/browser_thread.h" |
| 108 #include "content/public/browser/notification_service.h" | 109 #include "content/public/browser/notification_service.h" |
| (...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 | 339 |
| 339 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 340 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 340 } | 341 } |
| 341 | 342 |
| 342 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 343 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| 343 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 344 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 344 // -- immediately before Profile creation(). | 345 // -- immediately before Profile creation(). |
| 345 | 346 |
| 346 // Now that the file thread exists we can record our stats. | 347 // Now that the file thread exists we can record our stats. |
| 347 BootTimesLoader::Get()->RecordChromeMainStats(); | 348 BootTimesLoader::Get()->RecordChromeMainStats(); |
| 349 LoginEventRecorder::Get()->SetDelegate(BootTimesLoader::Get()); |
| 348 | 350 |
| 349 // Trigger prefetching of ownership status. | 351 // Trigger prefetching of ownership status. |
| 350 DeviceSettingsService::Get()->Load(); | 352 DeviceSettingsService::Get()->Load(); |
| 351 | 353 |
| 352 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 354 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 353 // -- just before CreateProfile(). | 355 // -- just before CreateProfile(). |
| 354 | 356 |
| 355 UserManager::Initialize(); | 357 UserManager::Initialize(); |
| 356 | 358 |
| 357 // Initialize the screen locker now so that it can receive | 359 // Initialize the screen locker now so that it can receive |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 733 // Destroy DBus services immediately after threads are stopped. | 735 // Destroy DBus services immediately after threads are stopped. |
| 734 dbus_services_.reset(); | 736 dbus_services_.reset(); |
| 735 | 737 |
| 736 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 738 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 737 | 739 |
| 738 // Destroy DeviceSettingsService after g_browser_process. | 740 // Destroy DeviceSettingsService after g_browser_process. |
| 739 DeviceSettingsService::Shutdown(); | 741 DeviceSettingsService::Shutdown(); |
| 740 } | 742 } |
| 741 | 743 |
| 742 } // namespace chromeos | 744 } // namespace chromeos |
| OLD | NEW |