| 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_idle_logout.h" | 42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" |
| 44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" | 43 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" |
| 45 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 44 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| 46 #include "chrome/browser/chromeos/language_preferences.h" | 45 #include "chrome/browser/chromeos/language_preferences.h" |
| 47 #include "chrome/browser/chromeos/login/helper.h" | 46 #include "chrome/browser/chromeos/login/helper.h" |
| 48 #include "chrome/browser/chromeos/login/lock/screen_locker.h" | 47 #include "chrome/browser/chromeos/login/lock/screen_locker.h" |
| 49 #include "chrome/browser/chromeos/login/login_wizard.h" | 48 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 50 #include "chrome/browser/chromeos/login/session/user_session_manager.h" | 49 #include "chrome/browser/chromeos/login/session/user_session_manager.h" |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 // Start loading machine statistics here. StatisticsProvider::Shutdown() | 314 // Start loading machine statistics here. StatisticsProvider::Shutdown() |
| 316 // will ensure that loading is aborted on early exit. | 315 // will ensure that loading is aborted on early exit. |
| 317 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); | 316 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); |
| 318 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( | 317 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( |
| 319 content::BrowserThread::GetMessageLoopProxyForThread( | 318 content::BrowserThread::GetMessageLoopProxyForThread( |
| 320 content::BrowserThread::FILE), | 319 content::BrowserThread::FILE), |
| 321 load_oem_statistics); | 320 load_oem_statistics); |
| 322 | 321 |
| 323 base::FilePath downloads_directory; | 322 base::FilePath downloads_directory; |
| 324 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); | 323 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); |
| 325 imageburner::BurnManager::Initialize( | |
| 326 downloads_directory, g_browser_process->system_request_context()); | |
| 327 | 324 |
| 328 DeviceOAuth2TokenServiceFactory::Initialize(); | 325 DeviceOAuth2TokenServiceFactory::Initialize(); |
| 329 | 326 |
| 330 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); | 327 ChromeBrowserMainPartsLinux::PreMainMessageLoopRun(); |
| 331 } | 328 } |
| 332 | 329 |
| 333 void ChromeBrowserMainPartsChromeos::PreProfileInit() { | 330 void ChromeBrowserMainPartsChromeos::PreProfileInit() { |
| 334 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() | 331 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() |
| 335 // -- immediately before Profile creation(). | 332 // -- immediately before Profile creation(). |
| 336 | 333 |
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 698 // Singletons are finally destroyed in AtExitManager. | 695 // Singletons are finally destroyed in AtExitManager. |
| 699 XInputHierarchyChangedEventListener::GetInstance()->Stop(); | 696 XInputHierarchyChangedEventListener::GetInstance()->Stop(); |
| 700 | 697 |
| 701 DeviceUMA::GetInstance()->Stop(); | 698 DeviceUMA::GetInstance()->Stop(); |
| 702 | 699 |
| 703 // SystemKeyEventListener::Shutdown() is always safe to call, | 700 // SystemKeyEventListener::Shutdown() is always safe to call, |
| 704 // even if Initialize() wasn't called. | 701 // even if Initialize() wasn't called. |
| 705 SystemKeyEventListener::Shutdown(); | 702 SystemKeyEventListener::Shutdown(); |
| 706 #endif | 703 #endif |
| 707 | 704 |
| 708 imageburner::BurnManager::Shutdown(); | |
| 709 CrasAudioHandler::Shutdown(); | 705 CrasAudioHandler::Shutdown(); |
| 710 | 706 |
| 711 // Detach D-Bus clients before DBusThreadManager is shut down. | 707 // Detach D-Bus clients before DBusThreadManager is shut down. |
| 712 power_button_observer_.reset(); | 708 power_button_observer_.reset(); |
| 713 idle_action_warning_observer_.reset(); | 709 idle_action_warning_observer_.reset(); |
| 714 | 710 |
| 715 #if !defined(USE_ATHENA) | 711 #if !defined(USE_ATHENA) |
| 716 MagnificationManager::Shutdown(); | 712 MagnificationManager::Shutdown(); |
| 717 #endif | 713 #endif |
| 718 | 714 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 766 // Destroy DBus services immediately after threads are stopped. | 762 // Destroy DBus services immediately after threads are stopped. |
| 767 dbus_services_.reset(); | 763 dbus_services_.reset(); |
| 768 | 764 |
| 769 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 765 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 770 | 766 |
| 771 // Destroy DeviceSettingsService after g_browser_process. | 767 // Destroy DeviceSettingsService after g_browser_process. |
| 772 DeviceSettingsService::Shutdown(); | 768 DeviceSettingsService::Shutdown(); |
| 773 } | 769 } |
| 774 | 770 |
| 775 } // namespace chromeos | 771 } // namespace chromeos |
| OLD | NEW |