| 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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 #include "chromeos/cryptohome/homedir_methods.h" | 90 #include "chromeos/cryptohome/homedir_methods.h" |
| 91 #include "chromeos/cryptohome/system_salt_getter.h" | 91 #include "chromeos/cryptohome/system_salt_getter.h" |
| 92 #include "chromeos/dbus/dbus_thread_manager.h" | 92 #include "chromeos/dbus/dbus_thread_manager.h" |
| 93 #include "chromeos/dbus/power_policy_controller.h" | 93 #include "chromeos/dbus/power_policy_controller.h" |
| 94 #include "chromeos/dbus/session_manager_client.h" | 94 #include "chromeos/dbus/session_manager_client.h" |
| 95 #include "chromeos/disks/disk_mount_manager.h" | 95 #include "chromeos/disks/disk_mount_manager.h" |
| 96 #include "chromeos/ime/ime_keyboard.h" | 96 #include "chromeos/ime/ime_keyboard.h" |
| 97 #include "chromeos/ime/input_method_manager.h" | 97 #include "chromeos/ime/input_method_manager.h" |
| 98 #include "chromeos/login/login_state.h" | 98 #include "chromeos/login/login_state.h" |
| 99 #include "chromeos/login/user_names.h" | 99 #include "chromeos/login/user_names.h" |
| 100 #include "chromeos/login_event_recorder.h" |
| 100 #include "chromeos/network/network_change_notifier_chromeos.h" | 101 #include "chromeos/network/network_change_notifier_chromeos.h" |
| 101 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 102 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
| 102 #include "chromeos/network/network_handler.h" | 103 #include "chromeos/network/network_handler.h" |
| 103 #include "chromeos/system/statistics_provider.h" | 104 #include "chromeos/system/statistics_provider.h" |
| 104 #include "chromeos/tpm_token_loader.h" | 105 #include "chromeos/tpm_token_loader.h" |
| 105 #include "components/metrics/metrics_service.h" | 106 #include "components/metrics/metrics_service.h" |
| 106 #include "content/public/browser/browser_thread.h" | 107 #include "content/public/browser/browser_thread.h" |
| 107 #include "content/public/browser/notification_service.h" | 108 #include "content/public/browser/notification_service.h" |
| 108 #include "content/public/browser/power_save_blocker.h" | 109 #include "content/public/browser/power_save_blocker.h" |
| 109 #include "content/public/common/main_function_params.h" | 110 #include "content/public/common/main_function_params.h" |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 | 386 |
| 386 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 387 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 387 } | 388 } |
| 388 | 389 |
| 389 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 390 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| 390 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 391 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 391 // -- immediately before Profile creation(). | 392 // -- immediately before Profile creation(). |
| 392 | 393 |
| 393 // Now that the file thread exists we can record our stats. | 394 // Now that the file thread exists we can record our stats. |
| 394 BootTimesLoader::Get()->RecordChromeMainStats(); | 395 BootTimesLoader::Get()->RecordChromeMainStats(); |
| 396 LoginEventRecorder::Get()->SetDelegate(BootTimesLoader::Get()); |
| 397 |
| 395 | 398 |
| 396 // Trigger prefetching of ownership status. | 399 // Trigger prefetching of ownership status. |
| 397 DeviceSettingsService::Get()->Load(); | 400 DeviceSettingsService::Get()->Load(); |
| 398 | 401 |
| 399 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 402 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 400 // -- just before CreateProfile(). | 403 // -- just before CreateProfile(). |
| 401 | 404 |
| 402 UserManager::Initialize(); | 405 UserManager::Initialize(); |
| 403 | 406 |
| 404 // Initialize the screen locker now so that it can receive | 407 // Initialize the screen locker now so that it can receive |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 816 // Destroy DBus services immediately after threads are stopped. | 819 // Destroy DBus services immediately after threads are stopped. |
| 817 dbus_services_.reset(); | 820 dbus_services_.reset(); |
| 818 | 821 |
| 819 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 822 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 820 | 823 |
| 821 // Destroy DeviceSettingsService after g_browser_process. | 824 // Destroy DeviceSettingsService after g_browser_process. |
| 822 DeviceSettingsService::Shutdown(); | 825 DeviceSettingsService::Shutdown(); |
| 823 } | 826 } |
| 824 | 827 |
| 825 } // namespace chromeos | 828 } // namespace chromeos |
| OLD | NEW |