Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(780)

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 137193004: Save display preference on boot (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 13 matching lines...) Expand all
24 #include "chrome/browser/browser_process.h" 24 #include "chrome/browser/browser_process.h"
25 #include "chrome/browser/browser_process_platform_part_chromeos.h" 25 #include "chrome/browser/browser_process_platform_part_chromeos.h"
26 #include "chrome/browser/chrome_notification_types.h" 26 #include "chrome/browser/chrome_notification_types.h"
27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
29 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 29 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
30 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 30 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
31 #include "chrome/browser/chromeos/boot_times_loader.h" 31 #include "chrome/browser/chromeos/boot_times_loader.h"
32 #include "chrome/browser/chromeos/contacts/contact_manager.h" 32 #include "chrome/browser/chromeos/contacts/contact_manager.h"
33 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" 33 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
34 #include "chrome/browser/chromeos/display/display_configuration_observer.h"
35 #include "chrome/browser/chromeos/extensions/default_app_order.h" 34 #include "chrome/browser/chromeos/extensions/default_app_order.h"
36 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h" 35 #include "chrome/browser/chromeos/extensions/extension_system_event_observer.h"
37 #include "chrome/browser/chromeos/external_metrics.h" 36 #include "chrome/browser/chromeos/external_metrics.h"
38 #include "chrome/browser/chromeos/imageburner/burn_manager.h" 37 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
39 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 38 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
40 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" 39 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
41 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" 40 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
42 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 41 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
43 #include "chrome/browser/chromeos/login/authenticator.h" 42 #include "chrome/browser/chromeos/login/authenticator.h"
44 #include "chrome/browser/chromeos/login/login_utils.h" 43 #include "chrome/browser/chromeos/login/login_utils.h"
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
608 // they use the profile to dispatch extension events. 607 // they use the profile to dispatch extension events.
609 extension_system_event_observer_.reset(new ExtensionSystemEventObserver()); 608 extension_system_event_observer_.reset(new ExtensionSystemEventObserver());
610 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 609 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
611 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( 610 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create(
612 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, 611 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
613 "Retail mode"); 612 "Retail mode");
614 } 613 }
615 614
616 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); 615 peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
617 616
618 display_configuration_observer_.reset(
619 new DisplayConfigurationObserver());
620
621 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); 617 g_browser_process->platform_part()->InitializeAutomaticRebootManager();
622 618
623 // This observer cannot be created earlier because it requires the shell to be 619 // This observer cannot be created earlier because it requires the shell to be
624 // available. 620 // available.
625 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); 621 idle_action_warning_observer_.reset(new IdleActionWarningObserver());
626 622
627 ChromeBrowserMainPartsLinux::PostProfileInit(); 623 ChromeBrowserMainPartsLinux::PostProfileInit();
628 } 624 }
629 625
630 void ChromeBrowserMainPartsChromeos::PreBrowserStart() { 626 void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
712 #if defined(USE_X11) 708 #if defined(USE_X11)
713 DeviceUMA::GetInstance()->Stop(); 709 DeviceUMA::GetInstance()->Stop();
714 #endif 710 #endif
715 711
716 // SystemKeyEventListener::Shutdown() is always safe to call, 712 // SystemKeyEventListener::Shutdown() is always safe to call,
717 // even if Initialize() wasn't called. 713 // even if Initialize() wasn't called.
718 SystemKeyEventListener::Shutdown(); 714 SystemKeyEventListener::Shutdown();
719 imageburner::BurnManager::Shutdown(); 715 imageburner::BurnManager::Shutdown();
720 CrasAudioHandler::Shutdown(); 716 CrasAudioHandler::Shutdown();
721 717
722 // Let classes unregister themselves as observers of the ash::Shell singleton
723 // before the shell is destroyed.
724 display_configuration_observer_.reset();
725
726 // Detach D-Bus clients before DBusThreadManager is shut down. 718 // Detach D-Bus clients before DBusThreadManager is shut down.
727 power_button_observer_.reset(); 719 power_button_observer_.reset();
728 idle_action_warning_observer_.reset(); 720 idle_action_warning_observer_.reset();
729 721
730 // Delete ContactManager while |g_browser_process| is still alive. 722 // Delete ContactManager while |g_browser_process| is still alive.
731 contact_manager_.reset(); 723 contact_manager_.reset();
732 724
733 MagnificationManager::Shutdown(); 725 MagnificationManager::Shutdown();
734 AccessibilityManager::Shutdown(); 726 AccessibilityManager::Shutdown();
735 727
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 // Destroy DBus services immediately after threads are stopped. 763 // Destroy DBus services immediately after threads are stopped.
772 dbus_services_.reset(); 764 dbus_services_.reset();
773 765
774 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 766 ChromeBrowserMainPartsLinux::PostDestroyThreads();
775 767
776 // Destroy DeviceSettingsService after g_browser_process. 768 // Destroy DeviceSettingsService after g_browser_process.
777 DeviceSettingsService::Shutdown(); 769 DeviceSettingsService::Shutdown();
778 } 770 }
779 771
780 } // namespace chromeos 772 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698