summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-31 04:00:57 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-31 04:00:57 +0000
commit016f7435f23c3dbc14194557bd00a13de009b798 (patch)
treeadf226973d275fc2553d016a73f2e29f28554114 /chrome/browser
parent74bda14a9f7d490da4c473e0f8307bfe780d67cd (diff)
downloadchromium_src-016f7435f23c3dbc14194557bd00a13de009b798.zip
chromium_src-016f7435f23c3dbc14194557bd00a13de009b798.tar.gz
chromium_src-016f7435f23c3dbc14194557bd00a13de009b798.tar.bz2
chromeos: Remove dead SoftwareScreenDimmingRequested code.
This removes code that listened for SoftwareScreenDimmingRequested D-Bus signals emitted by powerd. powerd now calls a SetDisplaySoftwareDimming method exported by Chrome. BUG=221391 TBR=brettw@chromium.org Review URL: https://chromiumcodereview.appspot.com/13247009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/chrome_browser_main_chromeos.cc3
-rw-r--r--chrome/browser/chromeos/chrome_browser_main_chromeos.h2
-rw-r--r--chrome/browser/chromeos/power/screen_dimming_observer.cc25
-rw-r--r--chrome/browser/chromeos/power/screen_dimming_observer.h31
4 files changed, 0 insertions, 61 deletions
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index ee52030..fa8bc5e 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -59,7 +59,6 @@
#include "chrome/browser/chromeos/power/idle_action_warning_observer.h"
#include "chrome/browser/chromeos/power/power_button_observer.h"
#include "chrome/browser/chromeos/power/resume_observer.h"
-#include "chrome/browser/chromeos/power/screen_dimming_observer.h"
#include "chrome/browser/chromeos/power/screen_lock_observer.h"
#include "chrome/browser/chromeos/power/suspend_observer.h"
#include "chrome/browser/chromeos/power/user_activity_notifier.h"
@@ -688,7 +687,6 @@ void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
power_button_observer_.reset(new PowerButtonObserver);
user_activity_notifier_.reset(new UserActivityNotifier);
video_activity_notifier_.reset(new VideoActivityNotifier);
- screen_dimming_observer_.reset(new ScreenDimmingObserver);
ChromeBrowserMainPartsLinux::PostBrowserStart();
}
@@ -754,7 +752,6 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Detach D-Bus clients before DBusThreadManager is shut down.
power_button_observer_.reset();
- screen_dimming_observer_.reset();
screensaver_controller_.reset();
idle_action_warning_observer_.reset();
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
index d2120b5..b92d686 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
@@ -27,7 +27,6 @@ class IdleActionWarningObserver;
class MagnificationManager;
class PowerButtonObserver;
class ResumeObserver;
-class ScreenDimmingObserver;
class ScreenLockObserver;
class ScreensaverController;
class SessionManagerObserver;
@@ -87,7 +86,6 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_;
scoped_ptr<UserActivityNotifier> user_activity_notifier_;
scoped_ptr<VideoActivityNotifier> video_activity_notifier_;
- scoped_ptr<ScreenDimmingObserver> screen_dimming_observer_;
scoped_refptr<StorageMonitorCros> storage_monitor_;
scoped_ptr<system::AutomaticRebootManager> automatic_reboot_manager_;
scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_;
diff --git a/chrome/browser/chromeos/power/screen_dimming_observer.cc b/chrome/browser/chromeos/power/screen_dimming_observer.cc
deleted file mode 100644
index a09204d..0000000
--- a/chrome/browser/chromeos/power/screen_dimming_observer.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/power/screen_dimming_observer.h"
-
-#include "ash/shell.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-
-namespace chromeos {
-
-ScreenDimmingObserver::ScreenDimmingObserver() {
- DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
-}
-
-ScreenDimmingObserver::~ScreenDimmingObserver() {
- DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
-}
-
-void ScreenDimmingObserver::ScreenDimmingRequested(ScreenDimmingState state) {
- ash::Shell::GetInstance()->SetDimming(
- state == PowerManagerClient::Observer::SCREEN_DIMMING_IDLE);
-}
-
-} // namespace chromeos
diff --git a/chrome/browser/chromeos/power/screen_dimming_observer.h b/chrome/browser/chromeos/power/screen_dimming_observer.h
deleted file mode 100644
index 3462152..0000000
--- a/chrome/browser/chromeos/power/screen_dimming_observer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_CHROMEOS_POWER_SCREEN_DIMMING_OBSERVER_H_
-#define CHROME_BROWSER_CHROMEOS_POWER_SCREEN_DIMMING_OBSERVER_H_
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "chromeos/dbus/power_manager_client.h"
-
-namespace chromeos {
-
-// Listens for requests to enable or disable dimming of the screen in software
-// (as opposed to by adjusting a backlight).
-class ScreenDimmingObserver : public PowerManagerClient::Observer {
- public:
- // This class registers/unregisters itself as an observer in ctor/dtor.
- ScreenDimmingObserver();
- virtual ~ScreenDimmingObserver();
-
- private:
- // PowerManagerClient::Observer implementation.
- virtual void ScreenDimmingRequested(ScreenDimmingState state) OVERRIDE;
-
- DISALLOW_COPY_AND_ASSIGN(ScreenDimmingObserver);
-};
-
-} // namespace chromeos
-
-#endif // CHROME_BROWSER_CHROMEOS_POWER_SCREEN_DIMMING_OBSERVER_H_