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

Unified Diff: chromeos/dbus/power_manager_client.cc

Issue 470803008: chromeos: Avoid a startup crash when powerd isn't running. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 | « no previous file | no next file » | 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 2983add68aa7e36a38c3b6ff8aa178fa85bc80a2..56efcf1d3bf86b456323bf5a7f373debcd948e33 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698