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

Unified Diff: chromeos/dbus/power_manager_client.cc

Issue 12775019: chromeos: Remove PowerStateOverride. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unneeded dependency Created 7 years, 9 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
Index: chromeos/dbus/power_manager_client.cc
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index b4991665031de47c8316702a0dbaa693e050c325..63b7b39c3cda1f9f6d2140b967485ffecb3516bf 100644
--- a/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.cc
@@ -319,46 +319,6 @@ class PowerManagerClientImpl : public PowerManagerClient {
dbus::ObjectProxy::EmptyResponseCallback());
}
- virtual void RequestPowerStateOverrides(
- uint32 request_id,
- base::TimeDelta duration,
- int overrides,
- const PowerStateRequestIdCallback& callback) OVERRIDE {
- dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
- power_manager::kStateOverrideRequest);
- dbus::MessageWriter writer(&method_call);
-
- PowerStateControl protobuf;
- protobuf.set_request_id(request_id);
- protobuf.set_duration(duration.InSeconds());
- protobuf.set_disable_idle_dim(overrides & DISABLE_IDLE_DIM);
- protobuf.set_disable_idle_blank(overrides & DISABLE_IDLE_BLANK);
- protobuf.set_disable_idle_suspend(overrides & DISABLE_IDLE_SUSPEND);
- protobuf.set_disable_lid_suspend(overrides & DISABLE_LID_SUSPEND);
-
- if (!writer.AppendProtoAsArrayOfBytes(protobuf)) {
- LOG(ERROR) << "Error calling "
- << power_manager::kStateOverrideRequest;
- return;
- }
- power_manager_proxy_->CallMethod(
- &method_call,
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
- base::Bind(&PowerManagerClientImpl::OnPowerStateOverride,
- weak_ptr_factory_.GetWeakPtr(), callback));
- }
-
- virtual void CancelPowerStateOverrides(uint32 request_id) OVERRIDE {
- dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
- power_manager::kStateOverrideCancel);
- dbus::MessageWriter writer(&method_call);
- writer.AppendInt32(request_id);
- power_manager_proxy_->CallMethod(
- &method_call,
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
- dbus::ObjectProxy::EmptyResponseCallback());
- }
-
virtual void SetIsProjecting(bool is_projecting) OVERRIDE {
dbus::MethodCall method_call(
power_manager::kPowerManagerInterface,
@@ -502,25 +462,6 @@ class PowerManagerClientImpl : public PowerManagerClient {
callback.Run(idle_time_ms/1000);
}
- void OnPowerStateOverride(const PowerStateRequestIdCallback& callback,
- dbus::Response* response) {
- if (!response) {
- LOG(ERROR) << "Error calling " << power_manager::kStateOverrideRequest;
- return;
- }
-
- dbus::MessageReader reader(response);
- int32 request_id = 0;
- if (!reader.PopInt32(&request_id)) {
- LOG(ERROR) << "Error reading response from powerd: "
- << response->ToString();
- callback.Run(0);
- return;
- }
-
- callback.Run(request_id);
- }
-
void OnGetScreenBrightnessPercent(
const GetScreenBrightnessPercentCallback& callback,
dbus::Response* response) {
@@ -969,6 +910,7 @@ PowerManagerClient::PowerManagerClient() {
PowerManagerClient::~PowerManagerClient() {
}
+// static
PowerManagerClient* PowerManagerClient::Create(
DBusClientImplementationType type,
dbus::Bus* bus) {

Powered by Google App Engine
This is Rietveld 408576698