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

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

Issue 11624038: [In progress] Monitor suspend code (Closed) Base URL: https://git.chromium.org/git/chromium/src@git-svn
Patch Set: Created 8 years 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" 47 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
48 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 48 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
49 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h" 49 #include "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
50 #include "chrome/browser/chromeos/net/network_portal_detector.h" 50 #include "chrome/browser/chromeos/net/network_portal_detector.h"
51 #include "chrome/browser/chromeos/power/brightness_observer.h" 51 #include "chrome/browser/chromeos/power/brightness_observer.h"
52 #include "chrome/browser/chromeos/power/output_observer.h" 52 #include "chrome/browser/chromeos/power/output_observer.h"
53 #include "chrome/browser/chromeos/power/power_button_observer.h" 53 #include "chrome/browser/chromeos/power/power_button_observer.h"
54 #include "chrome/browser/chromeos/power/resume_observer.h" 54 #include "chrome/browser/chromeos/power/resume_observer.h"
55 #include "chrome/browser/chromeos/power/screen_dimming_observer.h" 55 #include "chrome/browser/chromeos/power/screen_dimming_observer.h"
56 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 56 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
57 #include "chrome/browser/chromeos/power/suspend_observer.h"
57 #include "chrome/browser/chromeos/power/user_activity_notifier.h" 58 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
58 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 59 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
59 #include "chrome/browser/chromeos/settings/device_settings_service.h" 60 #include "chrome/browser/chromeos/settings/device_settings_service.h"
60 #include "chrome/browser/chromeos/settings/owner_key_util.h" 61 #include "chrome/browser/chromeos/settings/owner_key_util.h"
61 #include "chrome/browser/chromeos/system/statistics_provider.h" 62 #include "chrome/browser/chromeos/system/statistics_provider.h"
62 #include "chrome/browser/chromeos/system_key_event_listener.h" 63 #include "chrome/browser/chromeos/system_key_event_listener.h"
63 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 64 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
64 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 65 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
65 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 66 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
66 #include "chrome/browser/defaults.h" 67 #include "chrome/browser/defaults.h"
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 if (!parameters().ui_task) 552 if (!parameters().ui_task)
552 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile()); 553 OptionallyRunChromeOSLoginManager(parsed_command_line(), profile());
553 554
554 // These observers must be initialized after the profile because 555 // These observers must be initialized after the profile because
555 // they use the profile to dispatch extension events. 556 // they use the profile to dispatch extension events.
556 // 557 //
557 // Initialize the brightness observer so that we'll display an onscreen 558 // Initialize the brightness observer so that we'll display an onscreen
558 // indication of brightness changes during login. 559 // indication of brightness changes during login.
559 brightness_observer_.reset(new BrightnessObserver()); 560 brightness_observer_.reset(new BrightnessObserver());
560 output_observer_.reset(new OutputObserver()); 561 output_observer_.reset(new OutputObserver());
562 suspend_observer_.reset(new SuspendObserver());
561 resume_observer_.reset(new ResumeObserver()); 563 resume_observer_.reset(new ResumeObserver());
562 screen_lock_observer_.reset(new ScreenLockObserver()); 564 screen_lock_observer_.reset(new ScreenLockObserver());
563 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 565 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
564 power_state_override_ = new PowerStateOverride( 566 power_state_override_ = new PowerStateOverride(
565 PowerStateOverride::BLOCK_DISPLAY_SLEEP); 567 PowerStateOverride::BLOCK_DISPLAY_SLEEP);
566 } 568 }
567 chromeos::accessibility::Initialize(); 569 chromeos::accessibility::Initialize();
568 570
569 primary_display_switch_observer_.reset( 571 primary_display_switch_observer_.reset(
570 new PrimaryDisplaySwitchObserver()); 572 new PrimaryDisplaySwitchObserver());
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 chromeos::NetworkPortalDetector::GetInstance()) { 648 chromeos::NetworkPortalDetector::GetInstance()) {
647 chromeos::NetworkPortalDetector::GetInstance()->Shutdown(); 649 chromeos::NetworkPortalDetector::GetInstance()->Shutdown();
648 } 650 }
649 651
650 // Tell DeviceSettingsService to stop talking to session_manager. 652 // Tell DeviceSettingsService to stop talking to session_manager.
651 DeviceSettingsService::Get()->Shutdown(); 653 DeviceSettingsService::Get()->Shutdown();
652 654
653 // We should remove observers attached to D-Bus clients before 655 // We should remove observers attached to D-Bus clients before
654 // DBusThreadManager is shut down. 656 // DBusThreadManager is shut down.
655 screen_lock_observer_.reset(); 657 screen_lock_observer_.reset();
658 suspend_observer_.reset();
656 resume_observer_.reset(); 659 resume_observer_.reset();
657 brightness_observer_.reset(); 660 brightness_observer_.reset();
658 output_observer_.reset(); 661 output_observer_.reset();
659 power_state_override_ = NULL; 662 power_state_override_ = NULL;
660 663
661 // The XInput2 event listener needs to be shut down earlier than when 664 // The XInput2 event listener needs to be shut down earlier than when
662 // Singletons are finally destroyed in AtExitManager. 665 // Singletons are finally destroyed in AtExitManager.
663 XInputHierarchyChangedEventListener::GetInstance()->Stop(); 666 XInputHierarchyChangedEventListener::GetInstance()->Stop();
664 667
665 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 668 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
736 } else if (trial->group() == margin_200mb) { 739 } else if (trial->group() == margin_200mb) {
737 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 740 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
738 LowMemoryObserver::SetLowMemoryMargin(200); 741 LowMemoryObserver::SetLowMemoryMargin(200);
739 } else { 742 } else {
740 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 743 LOG(WARNING) << "low_mem: Part of 'default' experiment";
741 } 744 }
742 } 745 }
743 } 746 }
744 747
745 } // namespace chromeos 748 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/power/suspend_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698