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

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

Issue 13638018: Add PeripheralBatteryObserver (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: update Created 7 years, 8 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
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 49 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
50 #include "chrome/browser/chromeos/login/wizard_controller.h" 50 #include "chrome/browser/chromeos/login/wizard_controller.h"
51 #include "chrome/browser/chromeos/memory/low_memory_observer.h" 51 #include "chrome/browser/chromeos/memory/low_memory_observer.h"
52 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" 52 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
53 #include "chrome/browser/chromeos/net/connectivity_state_helper.h" 53 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
54 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 54 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
55 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h" 55 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
56 #include "chrome/browser/chromeos/net/network_portal_detector.h" 56 #include "chrome/browser/chromeos/net/network_portal_detector.h"
57 #include "chrome/browser/chromeos/power/brightness_observer.h" 57 #include "chrome/browser/chromeos/power/brightness_observer.h"
58 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h" 58 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
59 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
59 #include "chrome/browser/chromeos/power/power_button_observer.h" 60 #include "chrome/browser/chromeos/power/power_button_observer.h"
60 #include "chrome/browser/chromeos/power/resume_observer.h" 61 #include "chrome/browser/chromeos/power/resume_observer.h"
61 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 62 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
62 #include "chrome/browser/chromeos/power/suspend_observer.h" 63 #include "chrome/browser/chromeos/power/suspend_observer.h"
63 #include "chrome/browser/chromeos/power/user_activity_notifier.h" 64 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
64 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 65 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
65 #include "chrome/browser/chromeos/screensaver/screensaver_controller.h" 66 #include "chrome/browser/chromeos/screensaver/screensaver_controller.h"
66 #include "chrome/browser/chromeos/settings/device_settings_service.h" 67 #include "chrome/browser/chromeos/settings/device_settings_service.h"
67 #include "chrome/browser/chromeos/settings/owner_key_util.h" 68 #include "chrome/browser/chromeos/settings/owner_key_util.h"
68 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" 69 #include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 screensaver_controller_.reset(new ScreensaverController()); 628 screensaver_controller_.reset(new ScreensaverController());
628 } 629 }
629 suspend_observer_.reset(new SuspendObserver()); 630 suspend_observer_.reset(new SuspendObserver());
630 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 631 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
631 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( 632 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create(
632 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, 633 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
633 "Retail mode"); 634 "Retail mode");
634 } 635 }
635 chromeos::accessibility::Initialize(); 636 chromeos::accessibility::Initialize();
636 637
638 peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
639
637 storage_monitor_->Init(); 640 storage_monitor_->Init();
638 641
639 // Initialize the network portal detector for Chrome OS. The network 642 // Initialize the network portal detector for Chrome OS. The network
640 // portal detector starts to listen for notifications from 643 // portal detector starts to listen for notifications from
641 // NetworkLibrary about changes in the NetworkManager and initiates 644 // NetworkLibrary about changes in the NetworkManager and initiates
642 // captive portal detection for active networks. 645 // captive portal detection for active networks.
643 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance(); 646 NetworkPortalDetector* detector = NetworkPortalDetector::GetInstance();
644 if (NetworkPortalDetector::IsEnabled() && detector) { 647 if (NetworkPortalDetector::IsEnabled() && detector) {
645 detector->Init(); 648 detector->Init();
646 #if defined(GOOGLE_CHROME_BUILD) 649 #if defined(GOOGLE_CHROME_BUILD)
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
732 // Tell DeviceSettingsService to stop talking to session_manager. 735 // Tell DeviceSettingsService to stop talking to session_manager.
733 DeviceSettingsService::Get()->Shutdown(); 736 DeviceSettingsService::Get()->Shutdown();
734 737
735 // We should remove observers attached to D-Bus clients before 738 // We should remove observers attached to D-Bus clients before
736 // DBusThreadManager is shut down. 739 // DBusThreadManager is shut down.
737 screen_lock_observer_.reset(); 740 screen_lock_observer_.reset();
738 suspend_observer_.reset(); 741 suspend_observer_.reset();
739 resume_observer_.reset(); 742 resume_observer_.reset();
740 brightness_observer_.reset(); 743 brightness_observer_.reset();
741 retail_mode_power_save_blocker_.reset(); 744 retail_mode_power_save_blocker_.reset();
745 peripheral_battery_observer_.reset();
742 746
743 // The XInput2 event listener needs to be shut down earlier than when 747 // The XInput2 event listener needs to be shut down earlier than when
744 // Singletons are finally destroyed in AtExitManager. 748 // Singletons are finally destroyed in AtExitManager.
745 XInputHierarchyChangedEventListener::GetInstance()->Stop(); 749 XInputHierarchyChangedEventListener::GetInstance()->Stop();
746 750
747 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 751 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
748 // even if Initialize() wasn't called. 752 // even if Initialize() wasn't called.
749 SystemKeyEventListener::Shutdown(); 753 SystemKeyEventListener::Shutdown();
750 imageburner::BurnManager::Shutdown(); 754 imageburner::BurnManager::Shutdown();
751 AudioHandler::Shutdown(); 755 AudioHandler::Shutdown();
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0); 877 trial->AppendGroup("4GB_RAM_4GB_swap", zram_group == '4' ? 1 : 0);
874 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0); 878 trial->AppendGroup("4GB_RAM_6GB_swap", zram_group == '5' ? 1 : 0);
875 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0); 879 trial->AppendGroup("snow_no_swap", zram_group == '6' ? 1 : 0);
876 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0); 880 trial->AppendGroup("snow_1GB_swap", zram_group == '7' ? 1 : 0);
877 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0); 881 trial->AppendGroup("snow_2GB_swap", zram_group == '8' ? 1 : 0);
878 // This is necessary to start the experiment as a side effect. 882 // This is necessary to start the experiment as a side effect.
879 trial->group(); 883 trial->group();
880 } 884 }
881 885
882 } // namespace chromeos 886 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698