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

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

Issue 12036092: Implement support for monitor suspend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@git-svn
Patch Set: Fixed nits Created 7 years, 11 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) 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 502 matching lines...) Expand 10 before | Expand all | Expand 10 after
569 570
570 // These observers must be initialized after the profile because 571 // These observers must be initialized after the profile because
571 // they use the profile to dispatch extension events. 572 // they use the profile to dispatch extension events.
572 // 573 //
573 // Initialize the brightness observer so that we'll display an onscreen 574 // Initialize the brightness observer so that we'll display an onscreen
574 // indication of brightness changes during login. 575 // indication of brightness changes during login.
575 brightness_observer_.reset(new BrightnessObserver()); 576 brightness_observer_.reset(new BrightnessObserver());
576 output_observer_.reset(new OutputObserver()); 577 output_observer_.reset(new OutputObserver());
577 resume_observer_.reset(new ResumeObserver()); 578 resume_observer_.reset(new ResumeObserver());
578 screen_lock_observer_.reset(new ScreenLockObserver()); 579 screen_lock_observer_.reset(new ScreenLockObserver());
580 suspend_observer_.reset(new SuspendObserver());
579 if (KioskModeSettings::Get()->IsKioskModeEnabled()) { 581 if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
580 power_state_override_ = new PowerStateOverride( 582 power_state_override_ = new PowerStateOverride(
581 PowerStateOverride::BLOCK_DISPLAY_SLEEP); 583 PowerStateOverride::BLOCK_DISPLAY_SLEEP);
582 } 584 }
583 chromeos::accessibility::Initialize(); 585 chromeos::accessibility::Initialize();
584 586
585 removable_device_notifications_ = 587 removable_device_notifications_ =
586 new RemovableDeviceNotificationsCros(); 588 new RemovableDeviceNotificationsCros();
587 589
588 // Initialize the network portal detector for Chrome OS. The network 590 // Initialize the network portal detector for Chrome OS. The network
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 chromeos::NetworkPortalDetector::GetInstance()) { 666 chromeos::NetworkPortalDetector::GetInstance()) {
665 chromeos::NetworkPortalDetector::GetInstance()->Shutdown(); 667 chromeos::NetworkPortalDetector::GetInstance()->Shutdown();
666 } 668 }
667 669
668 // Tell DeviceSettingsService to stop talking to session_manager. 670 // Tell DeviceSettingsService to stop talking to session_manager.
669 DeviceSettingsService::Get()->Shutdown(); 671 DeviceSettingsService::Get()->Shutdown();
670 672
671 // We should remove observers attached to D-Bus clients before 673 // We should remove observers attached to D-Bus clients before
672 // DBusThreadManager is shut down. 674 // DBusThreadManager is shut down.
673 screen_lock_observer_.reset(); 675 screen_lock_observer_.reset();
676 suspend_observer_.reset();
674 resume_observer_.reset(); 677 resume_observer_.reset();
675 brightness_observer_.reset(); 678 brightness_observer_.reset();
676 output_observer_.reset(); 679 output_observer_.reset();
677 power_state_override_ = NULL; 680 power_state_override_ = NULL;
678 681
679 // The XInput2 event listener needs to be shut down earlier than when 682 // The XInput2 event listener needs to be shut down earlier than when
680 // Singletons are finally destroyed in AtExitManager. 683 // Singletons are finally destroyed in AtExitManager.
681 XInputHierarchyChangedEventListener::GetInstance()->Stop(); 684 XInputHierarchyChangedEventListener::GetInstance()->Stop();
682 685
683 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 686 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
754 } else if (trial->group() == margin_200mb) { 757 } else if (trial->group() == margin_200mb) {
755 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 758 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
756 LowMemoryObserver::SetLowMemoryMargin(200); 759 LowMemoryObserver::SetLowMemoryMargin(200);
757 } else { 760 } else {
758 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 761 LOG(WARNING) << "low_mem: Part of 'default' experiment";
759 } 762 }
760 } 763 }
761 } 764 }
762 765
763 } // namespace chromeos 766 } // 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