| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 53 #include "chrome/browser/chromeos/login/wizard_controller.h" | 53 #include "chrome/browser/chromeos/login/wizard_controller.h" | 
| 54 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" | 54 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" | 
| 55 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | 55 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" | 
| 56 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" | 56 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h" | 
| 57 #include "chrome/browser/chromeos/options/cert_library.h" | 57 #include "chrome/browser/chromeos/options/cert_library.h" | 
| 58 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact
     ory.h" | 58 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact
     ory.h" | 
| 59 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 59 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 
| 60 #include "chrome/browser/chromeos/policy/device_local_account.h" | 60 #include "chrome/browser/chromeos/policy/device_local_account.h" | 
| 61 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" | 61 #include "chrome/browser/chromeos/power/freezer_cgroup_process_manager.h" | 
| 62 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" | 62 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" | 
| 63 #include "chrome/browser/chromeos/power/light_bar.h" |  | 
| 64 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" | 63 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" | 
| 65 #include "chrome/browser/chromeos/power/power_button_observer.h" | 64 #include "chrome/browser/chromeos/power/power_button_observer.h" | 
| 66 #include "chrome/browser/chromeos/power/power_data_collector.h" | 65 #include "chrome/browser/chromeos/power/power_data_collector.h" | 
| 67 #include "chrome/browser/chromeos/power/power_prefs.h" | 66 #include "chrome/browser/chromeos/power/power_prefs.h" | 
| 68 #include "chrome/browser/chromeos/power/renderer_freezer.h" | 67 #include "chrome/browser/chromeos/power/renderer_freezer.h" | 
| 69 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 68 #include "chrome/browser/chromeos/profiles/profile_helper.h" | 
| 70 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
     " | 69 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h
     " | 
| 71 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 70 #include "chrome/browser/chromeos/settings/device_settings_service.h" | 
| 72 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 71 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 
| 73 #include "chrome/browser/chromeos/system/input_device_settings.h" | 72 #include "chrome/browser/chromeos/system/input_device_settings.h" | 
| (...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 588   // Guest user profile is never initialized with locale settings, | 587   // Guest user profile is never initialized with locale settings, | 
| 589   // so we need special handling for Guest session. | 588   // so we need special handling for Guest session. | 
| 590   if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) | 589   if (user_manager::UserManager::Get()->IsLoggedInAsGuest()) | 
| 591     SetGuestLocale(profile()); | 590     SetGuestLocale(profile()); | 
| 592 | 591 | 
| 593   peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); | 592   peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); | 
| 594 | 593 | 
| 595   renderer_freezer_.reset( | 594   renderer_freezer_.reset( | 
| 596       new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>( | 595       new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>( | 
| 597           new FreezerCgroupProcessManager()))); | 596           new FreezerCgroupProcessManager()))); | 
| 598   if (base::CommandLine::ForCurrentProcess()->HasSwitch( |  | 
| 599           switches::kWakeOnPackets)) |  | 
| 600     light_bar_.reset(new LightBar()); |  | 
| 601 | 597 | 
| 602   g_browser_process->platform_part()->InitializeAutomaticRebootManager(); | 598   g_browser_process->platform_part()->InitializeAutomaticRebootManager(); | 
| 603   g_browser_process->platform_part()->InitializeDeviceDisablingManager(); | 599   g_browser_process->platform_part()->InitializeDeviceDisablingManager(); | 
| 604 | 600 | 
| 605   // This observer cannot be created earlier because it requires the shell to be | 601   // This observer cannot be created earlier because it requires the shell to be | 
| 606   // available. | 602   // available. | 
| 607   idle_action_warning_observer_.reset(new IdleActionWarningObserver()); | 603   idle_action_warning_observer_.reset(new IdleActionWarningObserver()); | 
| 608 | 604 | 
| 609   ChromeBrowserMainPartsLinux::PostProfileInit(); | 605   ChromeBrowserMainPartsLinux::PostProfileInit(); | 
| 610 } | 606 } | 
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 707   // Tell DeviceSettingsService to stop talking to session_manager. Do not | 703   // Tell DeviceSettingsService to stop talking to session_manager. Do not | 
| 708   // shutdown DeviceSettingsService yet, it might still be accessed by | 704   // shutdown DeviceSettingsService yet, it might still be accessed by | 
| 709   // BrowserPolicyConnector (owned by g_browser_process). | 705   // BrowserPolicyConnector (owned by g_browser_process). | 
| 710   DeviceSettingsService::Get()->UnsetSessionManager(); | 706   DeviceSettingsService::Get()->UnsetSessionManager(); | 
| 711 | 707 | 
| 712   // We should remove observers attached to D-Bus clients before | 708   // We should remove observers attached to D-Bus clients before | 
| 713   // DBusThreadManager is shut down. | 709   // DBusThreadManager is shut down. | 
| 714   peripheral_battery_observer_.reset(); | 710   peripheral_battery_observer_.reset(); | 
| 715   power_prefs_.reset(); | 711   power_prefs_.reset(); | 
| 716   renderer_freezer_.reset(); | 712   renderer_freezer_.reset(); | 
| 717   light_bar_.reset(); |  | 
| 718   wake_on_wifi_manager_.reset(); | 713   wake_on_wifi_manager_.reset(); | 
| 719   ScreenLocker::ShutDownClass(); | 714   ScreenLocker::ShutDownClass(); | 
| 720   keyboard_event_rewriters_.reset(); | 715   keyboard_event_rewriters_.reset(); | 
| 721 #if defined(USE_X11) | 716 #if defined(USE_X11) | 
| 722   // The XInput2 event listener needs to be shut down earlier than when | 717   // The XInput2 event listener needs to be shut down earlier than when | 
| 723   // Singletons are finally destroyed in AtExitManager. | 718   // Singletons are finally destroyed in AtExitManager. | 
| 724   XInputHierarchyChangedEventListener::GetInstance()->Stop(); | 719   XInputHierarchyChangedEventListener::GetInstance()->Stop(); | 
| 725 | 720 | 
| 726   DeviceUMA::GetInstance()->Stop(); | 721   DeviceUMA::GetInstance()->Stop(); | 
| 727 | 722 | 
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 797   // Destroy DBus services immediately after threads are stopped. | 792   // Destroy DBus services immediately after threads are stopped. | 
| 798   dbus_services_.reset(); | 793   dbus_services_.reset(); | 
| 799 | 794 | 
| 800   ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 795   ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 
| 801 | 796 | 
| 802   // Destroy DeviceSettingsService after g_browser_process. | 797   // Destroy DeviceSettingsService after g_browser_process. | 
| 803   DeviceSettingsService::Shutdown(); | 798   DeviceSettingsService::Shutdown(); | 
| 804 } | 799 } | 
| 805 | 800 | 
| 806 }  //  namespace chromeos | 801 }  //  namespace chromeos | 
| OLD | NEW | 
|---|