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

Side by Side Diff: chromeos/dbus/power_manager_client.cc

Issue 10703081: chromeos: Remove references to UnlockScreenFailed signal. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/dbus/power_manager_client.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/dbus/power_manager_client.h" 5 #include "chromeos/dbus/power_manager_client.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 base::Bind(&PowerManagerClientImpl::SignalConnected, 107 base::Bind(&PowerManagerClientImpl::SignalConnected,
108 weak_ptr_factory_.GetWeakPtr())); 108 weak_ptr_factory_.GetWeakPtr()));
109 109
110 session_manager_proxy_->ConnectToSignal( 110 session_manager_proxy_->ConnectToSignal(
111 chromium::kChromiumInterface, 111 chromium::kChromiumInterface,
112 chromium::kUnlockScreenSignal, 112 chromium::kUnlockScreenSignal,
113 base::Bind(&PowerManagerClientImpl::ScreenUnlockSignalReceived, 113 base::Bind(&PowerManagerClientImpl::ScreenUnlockSignalReceived,
114 weak_ptr_factory_.GetWeakPtr()), 114 weak_ptr_factory_.GetWeakPtr()),
115 base::Bind(&PowerManagerClientImpl::SignalConnected, 115 base::Bind(&PowerManagerClientImpl::SignalConnected,
116 weak_ptr_factory_.GetWeakPtr())); 116 weak_ptr_factory_.GetWeakPtr()));
117 session_manager_proxy_->ConnectToSignal(
118 chromium::kChromiumInterface,
119 chromium::kUnlockScreenFailedSignal,
120 base::Bind(&PowerManagerClientImpl::ScreenUnlockFailedSignalReceived,
121 weak_ptr_factory_.GetWeakPtr()),
122 base::Bind(&PowerManagerClientImpl::SignalConnected,
123 weak_ptr_factory_.GetWeakPtr()));
124 117
125 power_manager_proxy_->ConnectToSignal( 118 power_manager_proxy_->ConnectToSignal(
126 power_manager::kPowerManagerInterface, 119 power_manager::kPowerManagerInterface,
127 power_manager::kIdleNotifySignal, 120 power_manager::kIdleNotifySignal,
128 base::Bind(&PowerManagerClientImpl::IdleNotifySignalReceived, 121 base::Bind(&PowerManagerClientImpl::IdleNotifySignalReceived,
129 weak_ptr_factory_.GetWeakPtr()), 122 weak_ptr_factory_.GetWeakPtr()),
130 base::Bind(&PowerManagerClientImpl::SignalConnected, 123 base::Bind(&PowerManagerClientImpl::SignalConnected,
131 weak_ptr_factory_.GetWeakPtr())); 124 weak_ptr_factory_.GetWeakPtr()));
132 125
133 power_manager_proxy_->ConnectToSignal( 126 power_manager_proxy_->ConnectToSignal(
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 } 573 }
581 574
582 void ScreenUnlockSignalReceived(dbus::Signal* signal) { 575 void ScreenUnlockSignalReceived(dbus::Signal* signal) {
583 screen_locked_ = false; 576 screen_locked_ = false;
584 UMA_HISTOGRAM_ENUMERATION("LockScreen.UnlockScreenPath", 577 UMA_HISTOGRAM_ENUMERATION("LockScreen.UnlockScreenPath",
585 UNLOCK_SCREEN_FINISHED, 578 UNLOCK_SCREEN_FINISHED,
586 NUM_UNLOCK_SCREEN_STATES); 579 NUM_UNLOCK_SCREEN_STATES);
587 FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen()); 580 FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen());
588 } 581 }
589 582
590 void ScreenUnlockFailedSignalReceived(dbus::Signal* signal) {
591 FOR_EACH_OBSERVER(Observer, observers_, UnlockScreenFailed());
592 }
593
594 void IdleNotifySignalReceived(dbus::Signal* signal) { 583 void IdleNotifySignalReceived(dbus::Signal* signal) {
595 dbus::MessageReader reader(signal); 584 dbus::MessageReader reader(signal);
596 int64 threshold = 0; 585 int64 threshold = 0;
597 if (!reader.PopInt64(&threshold)) { 586 if (!reader.PopInt64(&threshold)) {
598 LOG(ERROR) << "Idle Notify signal had incorrect parameters: " 587 LOG(ERROR) << "Idle Notify signal had incorrect parameters: "
599 << signal->ToString(); 588 << signal->ToString();
600 return; 589 return;
601 } 590 }
602 DCHECK_GT(threshold, 0); 591 DCHECK_GT(threshold, 0);
603 592
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 PowerManagerClient* PowerManagerClient::Create( 798 PowerManagerClient* PowerManagerClient::Create(
810 DBusClientImplementationType type, 799 DBusClientImplementationType type,
811 dbus::Bus* bus) { 800 dbus::Bus* bus) {
812 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) 801 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
813 return new PowerManagerClientImpl(bus); 802 return new PowerManagerClientImpl(bus);
814 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); 803 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
815 return new PowerManagerClientStubImpl(); 804 return new PowerManagerClientStubImpl();
816 } 805 }
817 806
818 } // namespace chromeos 807 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/power_manager_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698