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" | |
101 #include "chromeos/network/network_change_notifier_chromeos.h" | 100 #include "chromeos/network/network_change_notifier_chromeos.h" |
102 #include "chromeos/network/network_change_notifier_factory_chromeos.h" | 101 #include "chromeos/network/network_change_notifier_factory_chromeos.h" |
103 #include "chromeos/network/network_handler.h" | 102 #include "chromeos/network/network_handler.h" |
104 #include "chromeos/system/statistics_provider.h" | 103 #include "chromeos/system/statistics_provider.h" |
105 #include "chromeos/tpm_token_loader.h" | 104 #include "chromeos/tpm_token_loader.h" |
106 #include "components/metrics/metrics_service.h" | 105 #include "components/metrics/metrics_service.h" |
107 #include "components/session_manager/core/session_manager.h" | 106 #include "components/session_manager/core/session_manager.h" |
108 #include "content/public/browser/browser_thread.h" | 107 #include "content/public/browser/browser_thread.h" |
109 #include "content/public/browser/notification_service.h" | 108 #include "content/public/browser/notification_service.h" |
110 #include "content/public/browser/power_save_blocker.h" | 109 #include "content/public/browser/power_save_blocker.h" |
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 | 338 |
340 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 339 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
341 } | 340 } |
342 | 341 |
343 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 342 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
344 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 343 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
345 // -- immediately before Profile creation(). | 344 // -- immediately before Profile creation(). |
346 | 345 |
347 // Now that the file thread exists we can record our stats. | 346 // Now that the file thread exists we can record our stats. |
348 BootTimesLoader::Get()->RecordChromeMainStats(); | 347 BootTimesLoader::Get()->RecordChromeMainStats(); |
349 LoginEventRecorder::Get()->SetDelegate(BootTimesLoader::Get()); | |
350 | 348 |
351 // Trigger prefetching of ownership status. | 349 // Trigger prefetching of ownership status. |
352 DeviceSettingsService::Get()->Load(); | 350 DeviceSettingsService::Get()->Load(); |
353 | 351 |
354 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 352 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
355 // -- just before CreateProfile(). | 353 // -- just before CreateProfile(). |
356 | 354 |
357 UserManager::Initialize(); | 355 UserManager::Initialize(); |
358 | 356 |
359 // Initialize the screen locker now so that it can receive | 357 // Initialize the screen locker now so that it can receive |
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
734 // Destroy DBus services immediately after threads are stopped. | 732 // Destroy DBus services immediately after threads are stopped. |
735 dbus_services_.reset(); | 733 dbus_services_.reset(); |
736 | 734 |
737 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 735 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
738 | 736 |
739 // Destroy DeviceSettingsService after g_browser_process. | 737 // Destroy DeviceSettingsService after g_browser_process. |
740 DeviceSettingsService::Shutdown(); | 738 DeviceSettingsService::Shutdown(); |
741 } | 739 } |
742 | 740 |
743 } // namespace chromeos | 741 } // namespace chromeos |
OLD | NEW |