summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/power_manager_client.cc
diff options
context:
space:
mode:
authorderat <derat@chromium.org>2014-08-25 11:44:34 -0700
committerCommit bot <commit-bot@chromium.org>2014-08-25 18:45:39 +0000
commit7c3c3e50256f9435369650f423a669a764381587 (patch)
treee0f87cd1fdc440209b1a9a2b99cf7b82a7c6d856 /chromeos/dbus/power_manager_client.cc
parentec922586ba4a08e43c305fc9698f08cd653e9f68 (diff)
downloadchromium_src-7c3c3e50256f9435369650f423a669a764381587.zip
chromium_src-7c3c3e50256f9435369650f423a669a764381587.tar.gz
chromium_src-7c3c3e50256f9435369650f423a669a764381587.tar.bz2
chromeos: Avoid a startup crash when powerd isn't running.
Introduced by r290692. BUG=406968 Review URL: https://codereview.chromium.org/470803008 Cr-Commit-Position: refs/heads/master@{#291725}
Diffstat (limited to 'chromeos/dbus/power_manager_client.cc')
-rw-r--r--chromeos/dbus/power_manager_client.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/chromeos/dbus/power_manager_client.cc b/chromeos/dbus/power_manager_client.cc
index 2983add68..56efcf1 100644
--- a/chromeos/dbus/power_manager_client.cc
+++ b/chromeos/dbus/power_manager_client.cc
@@ -438,16 +438,17 @@ class PowerManagerClientImpl : public PowerManagerClient {
}
void HandleRegisterSuspendDelayReply(bool dark_suspend,
+ const std::string& method_name,
dbus::Response* response) {
if (!response) {
- LOG(ERROR) << "Error calling " << response->GetMember();
+ LOG(ERROR) << "Error calling " << method_name;
return;
}
dbus::MessageReader reader(response);
power_manager::RegisterSuspendDelayReply protobuf;
if (!reader.PopArrayOfBytesAsProto(&protobuf)) {
- LOG(ERROR) << "Unable to parse reply from " << response->GetMember();
+ LOG(ERROR) << "Unable to parse reply from " << method_name;
return;
}
@@ -619,15 +620,15 @@ class PowerManagerClientImpl : public PowerManagerClient {
RegisterSuspendDelayImpl(
power_manager::kRegisterSuspendDelayMethod,
protobuf_request,
- base::Bind(
- &PowerManagerClientImpl::HandleRegisterSuspendDelayReply,
- weak_ptr_factory_.GetWeakPtr(), false));
+ base::Bind(&PowerManagerClientImpl::HandleRegisterSuspendDelayReply,
+ weak_ptr_factory_.GetWeakPtr(), false,
+ power_manager::kRegisterSuspendDelayMethod));
RegisterSuspendDelayImpl(
power_manager::kRegisterDarkSuspendDelayMethod,
protobuf_request,
- base::Bind(
- &PowerManagerClientImpl::HandleRegisterSuspendDelayReply,
- weak_ptr_factory_.GetWeakPtr(), true));
+ base::Bind(&PowerManagerClientImpl::HandleRegisterSuspendDelayReply,
+ weak_ptr_factory_.GetWeakPtr(), true,
+ power_manager::kRegisterDarkSuspendDelayMethod));
}
// Records the fact that an observer has finished doing asynchronous work