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

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

Issue 543303002: chromeos: power: Refactor RendererFreezer and add tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. Created 6 years, 3 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/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "chrome/browser/chromeos/login/startup_utils.h" 51 #include "chrome/browser/chromeos/login/startup_utils.h"
52 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 52 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
53 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 53 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
54 #include "chrome/browser/chromeos/login/wizard_controller.h" 54 #include "chrome/browser/chromeos/login/wizard_controller.h"
55 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" 55 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
56 #include "chrome/browser/chromeos/net/network_portal_detector_impl.h" 56 #include "chrome/browser/chromeos/net/network_portal_detector_impl.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_factory.h" 58 #include "chrome/browser/chromeos/ownership/owner_settings_service_factory.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/idle_action_warning_observer.h" 62 #include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
62 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h" 63 #include "chrome/browser/chromeos/power/peripheral_battery_observer.h"
63 #include "chrome/browser/chromeos/power/power_button_observer.h" 64 #include "chrome/browser/chromeos/power/power_button_observer.h"
64 #include "chrome/browser/chromeos/power/power_data_collector.h" 65 #include "chrome/browser/chromeos/power/power_data_collector.h"
65 #include "chrome/browser/chromeos/power/power_prefs.h" 66 #include "chrome/browser/chromeos/power/power_prefs.h"
66 #include "chrome/browser/chromeos/power/renderer_freezer.h" 67 #include "chrome/browser/chromeos/power/renderer_freezer.h"
67 #include "chrome/browser/chromeos/profiles/profile_helper.h" 68 #include "chrome/browser/chromeos/profiles/profile_helper.h"
68 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h " 69 #include "chrome/browser/chromeos/settings/device_oauth2_token_service_factory.h "
69 #include "chrome/browser/chromeos/settings/device_settings_service.h" 70 #include "chrome/browser/chromeos/settings/device_settings_service.h"
70 #include "chrome/browser/chromeos/status/data_promo_notification.h" 71 #include "chrome/browser/chromeos/status/data_promo_notification.h"
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 // they use the profile to dispatch extension events. 555 // they use the profile to dispatch extension events.
555 extension_system_event_observer_.reset(new ExtensionSystemEventObserver()); 556 extension_system_event_observer_.reset(new ExtensionSystemEventObserver());
556 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 557 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
557 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create( 558 retail_mode_power_save_blocker_ = content::PowerSaveBlocker::Create(
558 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep, 559 content::PowerSaveBlocker::kPowerSaveBlockPreventDisplaySleep,
559 "Retail mode"); 560 "Retail mode");
560 } 561 }
561 562
562 peripheral_battery_observer_.reset(new PeripheralBatteryObserver()); 563 peripheral_battery_observer_.reset(new PeripheralBatteryObserver());
563 564
564 renderer_freezer_.reset(new RendererFreezer()); 565 renderer_freezer_.reset(
566 new RendererFreezer(scoped_ptr<RendererFreezer::Delegate>(
567 new FreezerCgroupProcessManager())));
565 568
566 g_browser_process->platform_part()->InitializeAutomaticRebootManager(); 569 g_browser_process->platform_part()->InitializeAutomaticRebootManager();
567 570
568 // This observer cannot be created earlier because it requires the shell to be 571 // This observer cannot be created earlier because it requires the shell to be
569 // available. 572 // available.
570 idle_action_warning_observer_.reset(new IdleActionWarningObserver()); 573 idle_action_warning_observer_.reset(new IdleActionWarningObserver());
571 574
572 ChromeBrowserMainPartsLinux::PostProfileInit(); 575 ChromeBrowserMainPartsLinux::PostProfileInit();
573 } 576 }
574 577
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 // Destroy DBus services immediately after threads are stopped. 762 // Destroy DBus services immediately after threads are stopped.
760 dbus_services_.reset(); 763 dbus_services_.reset();
761 764
762 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 765 ChromeBrowserMainPartsLinux::PostDestroyThreads();
763 766
764 // Destroy DeviceSettingsService after g_browser_process. 767 // Destroy DeviceSettingsService after g_browser_process.
765 DeviceSettingsService::Shutdown(); 768 DeviceSettingsService::Shutdown();
766 } 769 }
767 770
768 } // namespace chromeos 771 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698