| 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 19 matching lines...) Expand all Loading... |
| 30 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification
.h" | 30 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification
.h" |
| 31 #include "chrome/browser/chromeos/boot_times_loader.h" | 31 #include "chrome/browser/chromeos/boot_times_loader.h" |
| 32 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" | 32 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" |
| 33 #include "chrome/browser/chromeos/device/input_service_proxy.h" | 33 #include "chrome/browser/chromeos/device/input_service_proxy.h" |
| 34 #include "chrome/browser/chromeos/events/event_rewriter.h" | 34 #include "chrome/browser/chromeos/events/event_rewriter.h" |
| 35 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" | 35 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" |
| 36 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" | 36 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" |
| 37 #include "chrome/browser/chromeos/extensions/default_app_order.h" | 37 #include "chrome/browser/chromeos/extensions/default_app_order.h" |
| 38 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h" | 38 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h" |
| 39 #include "chrome/browser/chromeos/external_metrics.h" | 39 #include "chrome/browser/chromeos/external_metrics.h" |
| 40 #include "chrome/browser/chromeos/imageburner/burn_manager.h" | |
| 41 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 40 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
| 42 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 41 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| 44 #include "chrome/browser/chromeos/language_preferences.h" | 43 #include "chrome/browser/chromeos/language_preferences.h" |
| 45 #include "chrome/browser/chromeos/login/helper.h" | 44 #include "chrome/browser/chromeos/login/helper.h" |
| 46 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 45 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 47 #include "chrome/browser/chromeos/login/login_wizard.h" | 46 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 48 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 47 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| 49 #include "chrome/browser/chromeos/login/startup_utils.h" | 48 #include "chrome/browser/chromeos/login/startup_utils.h" |
| 50 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 49 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 329 // Start loading machine statistics here. StatisticsProvider::Shutdown() | 328 // Start loading machine statistics here. StatisticsProvider::Shutdown() |
| 330 // will ensure that loading is aborted on early exit. | 329 // will ensure that loading is aborted on early exit. |
| 331 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); | 330 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); |
| 332 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( | 331 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( |
| 333 content::BrowserThread::GetMessageLoopProxyForThread( | 332 content::BrowserThread::GetMessageLoopProxyForThread( |
| 334 content::BrowserThread::FILE), | 333 content::BrowserThread::FILE), |
| 335 load_oem_statistics); | 334 load_oem_statistics); |
| 336 | 335 |
| 337 base::FilePath downloads_directory; | 336 base::FilePath downloads_directory; |
| 338 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 337 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
| 339 imageburner::BurnManager::Initialize( | |
| 340 downloads_directory, g_browser_process->system_request_context()); | |
| 341 | 338 |
| 342 DeviceOAuth2TokenServiceFactory::Initialize(); | 339 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 343 | 340 |
| 344 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 341 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 345 } | 342 } |
| 346 | 343 |
| 347 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 344 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| 348 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 345 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 349 // -- immediately before Profile creation(). | 346 // -- immediately before Profile creation(). |
| 350 | 347 |
| (...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 716 // Singletons are finally destroyed in AtExitManager. | 713 // Singletons are finally destroyed in AtExitManager. |
| 717 XInputHierarchyChangedEventListener::GetInstance()->Stop(); | 714 XInputHierarchyChangedEventListener::GetInstance()->Stop(); |
| 718 | 715 |
| 719 DeviceUMA::GetInstance()->Stop(); | 716 DeviceUMA::GetInstance()->Stop(); |
| 720 | 717 |
| 721 // SystemKeyEventListener::Shutdown() is always safe to call, | 718 // SystemKeyEventListener::Shutdown() is always safe to call, |
| 722 // even if Initialize() wasn't called. | 719 // even if Initialize() wasn't called. |
| 723 SystemKeyEventListener::Shutdown(); | 720 SystemKeyEventListener::Shutdown(); |
| 724 #endif | 721 #endif |
| 725 | 722 |
| 726 imageburner::BurnManager::Shutdown(); | |
| 727 CrasAudioHandler::Shutdown(); | 723 CrasAudioHandler::Shutdown(); |
| 728 | 724 |
| 729 // Detach D-Bus clients before DBusThreadManager is shut down. | 725 // Detach D-Bus clients before DBusThreadManager is shut down. |
| 730 power_button_observer_.reset(); | 726 power_button_observer_.reset(); |
| 731 idle_action_warning_observer_.reset(); | 727 idle_action_warning_observer_.reset(); |
| 732 | 728 |
| 733 #if !defined(USE_ATHENA) | 729 #if !defined(USE_ATHENA) |
| 734 MagnificationManager::Shutdown(); | 730 MagnificationManager::Shutdown(); |
| 735 #endif | 731 #endif |
| 736 | 732 |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 // Destroy DBus services immediately after threads are stopped. | 782 // Destroy DBus services immediately after threads are stopped. |
| 787 dbus_services_.reset(); | 783 dbus_services_.reset(); |
| 788 | 784 |
| 789 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 785 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 790 | 786 |
| 791 // Destroy DeviceSettingsService after g_browser_process. | 787 // Destroy DeviceSettingsService after g_browser_process. |
| 792 DeviceSettingsService::Shutdown(); | 788 DeviceSettingsService::Shutdown(); |
| 793 } | 789 } |
| 794 | 790 |
| 795 } // namespace chromeos | 791 } // namespace chromeos |
| OLD | NEW |