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

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

Issue 18153007: Add policies to control power management on the Chrome OS login screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments addressed. Created 7 years, 5 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/connectivity_state_helper.h" 55 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
56 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 56 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
57 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h" 57 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
58 #include "chrome/browser/chromeos/net/network_portal_detector.h" 58 #include "chrome/browser/chromeos/net/network_portal_detector.h"
59 #include "chrome/browser/chromeos/power/brightness_observer.h" 59 #include "chrome/browser/chromeos/power/brightness_observer.h"
60 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 60 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
61 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" 61 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
62 #include "chrome/browser/chromeos/power/power_button_observer.h" 62 #include "chrome/browser/chromeos/power/power_button_observer.h"
63 #include "chrome/browser/chromeos/power/power_prefs.h"
63 #include "chrome/browser/chromeos/power/resume_observer.h" 64 #include "chrome/browser/chromeos/power/resume_observer.h"
64 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 65 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
65 #include "chrome/browser/chromeos/power/suspend_observer.h" 66 #include "chrome/browser/chromeos/power/suspend_observer.h"
66 #include "chrome/browser/chromeos/power/user_activity_notifier.h" 67 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
67 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 68 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
68 #include "chrome/browser/chromeos/profiles/profile_helper.h" 69 #include "chrome/browser/chromeos/profiles/profile_helper.h"
69 #include "chrome/browser/chromeos/screensaver/screensaver_controller.h" 70 #include "chrome/browser/chromeos/screensaver/screensaver_controller.h"
70 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 71 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
71 #include "chrome/browser/chromeos/settings/device_settings_service.h" 72 #include "chrome/browser/chromeos/settings/device_settings_service.h"
72 #include "chrome/browser/chromeos/settings/owner_key_util.h" 73 #include "chrome/browser/chromeos/settings/owner_key_util.h"
(...skipping 19 matching lines...) Expand all
92 #include "chrome/common/logging_chrome.h" 93 #include "chrome/common/logging_chrome.h"
93 #include "chrome/common/pref_names.h" 94 #include "chrome/common/pref_names.h"
94 #include "chromeos/audio/audio_devices_pref_handler.h" 95 #include "chromeos/audio/audio_devices_pref_handler.h"
95 #include "chromeos/audio/audio_pref_handler.h" 96 #include "chromeos/audio/audio_pref_handler.h"
96 #include "chromeos/audio/cras_audio_handler.h" 97 #include "chromeos/audio/cras_audio_handler.h"
97 #include "chromeos/chromeos_paths.h" 98 #include "chromeos/chromeos_paths.h"
98 #include "chromeos/chromeos_switches.h" 99 #include "chromeos/chromeos_switches.h"
99 #include "chromeos/cryptohome/async_method_caller.h" 100 #include "chromeos/cryptohome/async_method_caller.h"
100 #include "chromeos/cryptohome/cryptohome_library.h" 101 #include "chromeos/cryptohome/cryptohome_library.h"
101 #include "chromeos/dbus/dbus_thread_manager.h" 102 #include "chromeos/dbus/dbus_thread_manager.h"
103 #include "chromeos/dbus/power_policy_controller.h"
102 #include "chromeos/dbus/session_manager_client.h" 104 #include "chromeos/dbus/session_manager_client.h"
103 #include "chromeos/disks/disk_mount_manager.h" 105 #include "chromeos/disks/disk_mount_manager.h"
104 #include "chromeos/ime/input_method_manager.h" 106 #include "chromeos/ime/input_method_manager.h"
105 #include "chromeos/ime/xkeyboard.h" 107 #include "chromeos/ime/xkeyboard.h"
106 #include "chromeos/login/login_state.h" 108 #include "chromeos/login/login_state.h"
107 #include "chromeos/network/network_change_notifier_chromeos.h" 109 #include "chromeos/network/network_change_notifier_chromeos.h"
108 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 110 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
109 #include "chromeos/network/network_handler.h" 111 #include "chromeos/network/network_handler.h"
110 #include "content/public/browser/browser_thread.h" 112 #include "content/public/browser/browser_thread.h"
111 #include "content/public/browser/notification_service.h" 113 #include "content/public/browser/notification_service.h"
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 storage_monitor_.reset(new StorageMonitorCros()); 575 storage_monitor_.reset(new StorageMonitorCros());
574 576
575 // Make sure that wallpaper boot transition and other delays in OOBE 577 // Make sure that wallpaper boot transition and other delays in OOBE
576 // are disabled for tests and kiosk app launch by default. 578 // are disabled for tests and kiosk app launch by default.
577 // Individual tests may enable them if they want. 579 // Individual tests may enable them if they want.
578 if (parsed_command_line().HasSwitch(::switches::kTestType) || 580 if (parsed_command_line().HasSwitch(::switches::kTestType) ||
579 ShouldAutoLaunchKioskApp(parsed_command_line())) { 581 ShouldAutoLaunchKioskApp(parsed_command_line())) {
580 WizardController::SetZeroDelays(); 582 WizardController::SetZeroDelays();
581 } 583 }
582 584
585 power_prefs_.reset(new PowerPrefs(
586 DBusThreadManager::Get()->GetPowerPolicyController()));
587
583 // In Aura builds this will initialize ash::Shell. 588 // In Aura builds this will initialize ash::Shell.
584 ChromeBrowserMainPartsLinux::PreProfileInit(); 589 ChromeBrowserMainPartsLinux::PreProfileInit();
585 590
586 if (immediate_login) { 591 if (immediate_login) {
587 std::string username = 592 std::string username =
588 parsed_command_line().GetSwitchValueASCII(switches::kLoginUser); 593 parsed_command_line().GetSwitchValueASCII(switches::kLoginUser);
589 UserManager* user_manager = UserManager::Get(); 594 UserManager* user_manager = UserManager::Get();
590 // In case of multi-profiles --login-profile will contain user_id_hash. 595 // In case of multi-profiles --login-profile will contain user_id_hash.
591 std::string username_hash = 596 std::string username_hash =
592 parsed_command_line().GetSwitchValueASCII(switches::kLoginProfile); 597 parsed_command_line().GetSwitchValueASCII(switches::kLoginProfile);
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
784 DeviceSettingsService::Get()->UnsetSessionManager(); 789 DeviceSettingsService::Get()->UnsetSessionManager();
785 790
786 // We should remove observers attached to D-Bus clients before 791 // We should remove observers attached to D-Bus clients before
787 // DBusThreadManager is shut down. 792 // DBusThreadManager is shut down.
788 screen_lock_observer_.reset(); 793 screen_lock_observer_.reset();
789 suspend_observer_.reset(); 794 suspend_observer_.reset();
790 resume_observer_.reset(); 795 resume_observer_.reset();
791 brightness_observer_.reset(); 796 brightness_observer_.reset();
792 retail_mode_power_save_blocker_.reset(); 797 retail_mode_power_save_blocker_.reset();
793 peripheral_battery_observer_.reset(); 798 peripheral_battery_observer_.reset();
799 power_prefs_.reset();
794 800
795 // The XInput2 event listener needs to be shut down earlier than when 801 // The XInput2 event listener needs to be shut down earlier than when
796 // Singletons are finally destroyed in AtExitManager. 802 // Singletons are finally destroyed in AtExitManager.
797 XInputHierarchyChangedEventListener::GetInstance()->Stop(); 803 XInputHierarchyChangedEventListener::GetInstance()->Stop();
798 804
799 #if defined(USE_X11) 805 #if defined(USE_X11)
800 DeviceUMA::GetInstance()->Stop(); 806 DeviceUMA::GetInstance()->Stop();
801 #endif 807 #endif
802 808
803 // SystemKeyEventListener::Shutdown() is always safe to call, 809 // SystemKeyEventListener::Shutdown() is always safe to call,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 861 ChromeBrowserMainPartsLinux::PostDestroyThreads();
856 // Destroy DeviceSettingsService after g_browser_process. 862 // Destroy DeviceSettingsService after g_browser_process.
857 DeviceSettingsService::Shutdown(); 863 DeviceSettingsService::Shutdown();
858 } 864 }
859 865
860 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() { 866 void ChromeBrowserMainPartsChromeos::SetupPlatformFieldTrials() {
861 default_pinned_apps_field_trial::SetupTrial(); 867 default_pinned_apps_field_trial::SetupTrial();
862 } 868 }
863 869
864 } // namespace chromeos 870 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698