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

Unified Diff: chromeos/dbus/power_manager_client.cc

Issue 26800005: chromeos: Remove ScreensaverController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: delete "screensaver" extension permission Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/power_manager_client.h ('k') | extensions/common/permissions/api_permission.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/power_manager_client.cc
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index 23b4c26a3e25ca3bccab621210714ffb4f15f056..82b934a2d763d430ec2f5915fdae891fbf1ecd84 100644
--- a/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.cc
@@ -147,18 +147,6 @@ class PowerManagerClientImpl : public PowerManagerClient {
SimpleMethodCallToPowerManager(power_manager::kRequestShutdownMethod);
}
- virtual void RequestIdleNotification(int64 threshold) OVERRIDE {
- dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
- power_manager::kRequestIdleNotification);
- dbus::MessageWriter writer(&method_call);
- writer.AppendInt64(threshold);
-
- power_manager_proxy_->CallMethod(
- &method_call,
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
- dbus::ObjectProxy::EmptyResponseCallback());
- }
-
virtual void NotifyUserActivity(
power_manager::UserActivityType type) OVERRIDE {
dbus::MethodCall method_call(
@@ -262,14 +250,6 @@ class PowerManagerClientImpl : public PowerManagerClient {
power_manager_proxy_->ConnectToSignal(
power_manager::kPowerManagerInterface,
- power_manager::kIdleNotifySignal,
- base::Bind(&PowerManagerClientImpl::IdleNotifySignalReceived,
- weak_ptr_factory_.GetWeakPtr()),
- base::Bind(&PowerManagerClientImpl::SignalConnected,
- weak_ptr_factory_.GetWeakPtr()));
-
- power_manager_proxy_->ConnectToSignal(
- power_manager::kPowerManagerInterface,
power_manager::kInputEventSignal,
base::Bind(&PowerManagerClientImpl::InputEventReceived,
weak_ptr_factory_.GetWeakPtr()),
@@ -448,20 +428,6 @@ class PowerManagerClientImpl : public PowerManagerClient {
VLOG(1) << "Registered suspend delay " << suspend_delay_id_;
}
- void IdleNotifySignalReceived(dbus::Signal* signal) {
- dbus::MessageReader reader(signal);
- int64 threshold = 0;
- if (!reader.PopInt64(&threshold)) {
- LOG(ERROR) << "Idle Notify signal had incorrect parameters: "
- << signal->ToString();
- return;
- }
- DCHECK_GT(threshold, 0);
-
- VLOG(1) << "Idle Notify: " << threshold;
- FOR_EACH_OBSERVER(Observer, observers_, IdleNotify(threshold));
- }
-
void SuspendImminentReceived(dbus::Signal* signal) {
if (!has_suspend_delay_id_) {
LOG(ERROR) << "Received unrequested "
@@ -741,14 +707,6 @@ class PowerManagerClientStubImpl : public PowerManagerClient {
virtual void RequestRestart() OVERRIDE {}
virtual void RequestShutdown() OVERRIDE {}
- virtual void RequestIdleNotification(int64 threshold) OVERRIDE {
- base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE,
- base::Bind(&PowerManagerClientStubImpl::TriggerIdleNotify,
- weak_ptr_factory_.GetWeakPtr(), threshold),
- base::TimeDelta::FromMilliseconds(threshold));
- }
-
virtual void NotifyUserActivity(
power_manager::UserActivityType type) OVERRIDE {}
virtual void NotifyVideoActivity(bool is_fullscreen) OVERRIDE {}
@@ -835,10 +793,6 @@ class PowerManagerClientStubImpl : public PowerManagerClient {
BrightnessChanged(brightness_level, user_initiated));
}
- void TriggerIdleNotify(int64 threshold) {
- FOR_EACH_OBSERVER(Observer, observers_, IdleNotify(threshold));
- }
-
bool discharging_;
int battery_percentage_;
double brightness_;
« no previous file with comments | « chromeos/dbus/power_manager_client.h ('k') | extensions/common/permissions/api_permission.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698