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

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

Issue 12992004: chromeos: Remove dead power manager code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years, 9 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/shell.h" 10 #include "ash/shell.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "chrome/browser/chromeos/login/wizard_controller.h" 52 #include "chrome/browser/chromeos/login/wizard_controller.h"
53 #include "chrome/browser/chromeos/memory/low_memory_observer.h" 53 #include "chrome/browser/chromeos/memory/low_memory_observer.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/managed_network_configuration_handler.h" 57 #include "chrome/browser/chromeos/net/managed_network_configuration_handler.h"
58 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h" 58 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
59 #include "chrome/browser/chromeos/net/network_portal_detector.h" 59 #include "chrome/browser/chromeos/net/network_portal_detector.h"
60 #include "chrome/browser/chromeos/power/brightness_observer.h" 60 #include "chrome/browser/chromeos/power/brightness_observer.h"
61 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 61 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
62 #include "chrome/browser/chromeos/power/output_observer.h"
63 #include "chrome/browser/chromeos/power/power_button_observer.h" 62 #include "chrome/browser/chromeos/power/power_button_observer.h"
64 #include "chrome/browser/chromeos/power/resume_observer.h" 63 #include "chrome/browser/chromeos/power/resume_observer.h"
65 #include "chrome/browser/chromeos/power/screen_dimming_observer.h" 64 #include "chrome/browser/chromeos/power/screen_dimming_observer.h"
66 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 65 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
67 #include "chrome/browser/chromeos/power/suspend_observer.h" 66 #include "chrome/browser/chromeos/power/suspend_observer.h"
68 #include "chrome/browser/chromeos/power/user_activity_notifier.h" 67 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
69 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 68 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
70 #include "chrome/browser/chromeos/screensaver/screensaver_controller.h" 69 #include "chrome/browser/chromeos/screensaver/screensaver_controller.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/settings/owner_key_util.h" 71 #include "chrome/browser/chromeos/settings/owner_key_util.h"
(...skipping 15 matching lines...) Expand all
88 #include "chrome/common/chrome_switches.h" 87 #include "chrome/common/chrome_switches.h"
89 #include "chrome/common/chrome_version_info.h" 88 #include "chrome/common/chrome_version_info.h"
90 #include "chrome/common/logging_chrome.h" 89 #include "chrome/common/logging_chrome.h"
91 #include "chrome/common/pref_names.h" 90 #include "chrome/common/pref_names.h"
92 #include "chromeos/chromeos_switches.h" 91 #include "chromeos/chromeos_switches.h"
93 #include "chromeos/cryptohome/async_method_caller.h" 92 #include "chromeos/cryptohome/async_method_caller.h"
94 #include "chromeos/dbus/dbus_thread_manager.h" 93 #include "chromeos/dbus/dbus_thread_manager.h"
95 #include "chromeos/dbus/power_manager_client.h" 94 #include "chromeos/dbus/power_manager_client.h"
96 #include "chromeos/dbus/session_manager_client.h" 95 #include "chromeos/dbus/session_manager_client.h"
97 #include "chromeos/disks/disk_mount_manager.h" 96 #include "chromeos/disks/disk_mount_manager.h"
98 #include "chromeos/display/output_configurator.h"
99 #include "chromeos/network/geolocation_handler.h" 97 #include "chromeos/network/geolocation_handler.h"
100 #include "chromeos/network/network_change_notifier_chromeos.h" 98 #include "chromeos/network/network_change_notifier_chromeos.h"
101 #include "chromeos/network/network_change_notifier_factory_chromeos.h" 99 #include "chromeos/network/network_change_notifier_factory_chromeos.h"
102 #include "chromeos/network/network_configuration_handler.h" 100 #include "chromeos/network/network_configuration_handler.h"
103 #include "chromeos/network/network_event_log.h" 101 #include "chromeos/network/network_event_log.h"
104 #include "chromeos/network/network_state_handler.h" 102 #include "chromeos/network/network_state_handler.h"
105 #include "content/public/browser/browser_thread.h" 103 #include "content/public/browser/browser_thread.h"
106 #include "content/public/browser/notification_service.h" 104 #include "content/public/browser/notification_service.h"
107 #include "content/public/browser/power_save_blocker.h" 105 #include "content/public/browser/power_save_blocker.h"
108 #include "content/public/common/main_function_params.h" 106 #include "content/public/common/main_function_params.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile()); 604 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
607 } 605 }
608 } 606 }
609 607
610 // These observers must be initialized after the profile because 608 // These observers must be initialized after the profile because
611 // they use the profile to dispatch extension events. 609 // they use the profile to dispatch extension events.
612 // 610 //
613 // Initialize the brightness observer so that we'll display an onscreen 611 // Initialize the brightness observer so that we'll display an onscreen
614 // indication of brightness changes during login. 612 // indication of brightness changes during login.
615 brightness_observer_.reset(new BrightnessObserver()); 613 brightness_observer_.reset(new BrightnessObserver());
616 output_observer_.reset(new OutputObserver());
617 resume_observer_.reset(new ResumeObserver()); 614 resume_observer_.reset(new ResumeObserver());
618 screen_lock_observer_.reset(new ScreenLockObserver()); 615 screen_lock_observer_.reset(new ScreenLockObserver());
619 if (CommandLine::ForCurrentProcess()->HasSwitch( 616 if (CommandLine::ForCurrentProcess()->HasSwitch(
620 switches::kEnableScreensaverExtensions)) { 617 switches::kEnableScreensaverExtensions)) {
621 screensaver_controller_.reset(new ScreensaverController()); 618 screensaver_controller_.reset(new ScreensaverController());
622 } 619 }
623 suspend_observer_.reset(new SuspendObserver()); 620 suspend_observer_.reset(new SuspendObserver());
624 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 621 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
625 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( 622 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create(
626 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, 623 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 716
720 // Tell DeviceSettingsService to stop talking to session_manager. 717 // Tell DeviceSettingsService to stop talking to session_manager.
721 DeviceSettingsService::Get()->Shutdown(); 718 DeviceSettingsService::Get()->Shutdown();
722 719
723 // We should remove observers attached to D-Bus clients before 720 // We should remove observers attached to D-Bus clients before
724 // DBusThreadManager is shut down. 721 // DBusThreadManager is shut down.
725 screen_lock_observer_.reset(); 722 screen_lock_observer_.reset();
726 suspend_observer_.reset(); 723 suspend_observer_.reset();
727 resume_observer_.reset(); 724 resume_observer_.reset();
728 brightness_observer_.reset(); 725 brightness_observer_.reset();
729 output_observer_.reset();
730 retail_mode_power_save_blocker_.reset(); 726 retail_mode_power_save_blocker_.reset();
731 727
732 // The XInput2 event listener needs to be shut down earlier than when 728 // The XInput2 event listener needs to be shut down earlier than when
733 // Singletons are finally destroyed in AtExitManager. 729 // Singletons are finally destroyed in AtExitManager.
734 XInputHierarchyChangedEventListener::GetInstance()->Stop(); 730 XInputHierarchyChangedEventListener::GetInstance()->Stop();
735 731
736 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 732 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
737 // even if Initialize() wasn't called. 733 // even if Initialize() wasn't called.
738 SystemKeyEventListener::Shutdown(); 734 SystemKeyEventListener::Shutdown();
739 imageburner::BurnManager::Shutdown(); 735 imageburner::BurnManager::Shutdown();
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 856 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
861 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 857 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
862 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 858 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
863 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 859 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
864 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 860 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
865 // This is necessary to start the experiment as a side effect. 861 // This is necessary to start the experiment as a side effect.
866 trial->group(); 862 trial->group();
867 } 863 }
868 864
869 } // namespace chromeos 865 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/power/output_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698