OLD | NEW |
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 // Here we should unregister suspend notifications from powerd, | 61 // Here we should unregister suspend notifications from powerd, |
62 // however: | 62 // however: |
63 // - The lifetime of the PowerManagerClientImpl can extend past that of | 63 // - The lifetime of the PowerManagerClientImpl can extend past that of |
64 // the objectproxy, | 64 // the objectproxy, |
65 // - power_manager can already detect that the client is gone and | 65 // - power_manager can already detect that the client is gone and |
66 // unregister our suspend delay. | 66 // unregister our suspend delay. |
67 } | 67 } |
68 | 68 |
69 // PowerManagerClient overrides: | 69 // PowerManagerClient overrides: |
70 | 70 |
71 virtual void AddObserver(Observer* observer) OVERRIDE { | 71 virtual void AddObserver(Observer* observer) override { |
72 CHECK(observer); // http://crbug.com/119976 | 72 CHECK(observer); // http://crbug.com/119976 |
73 observers_.AddObserver(observer); | 73 observers_.AddObserver(observer); |
74 } | 74 } |
75 | 75 |
76 virtual void RemoveObserver(Observer* observer) OVERRIDE { | 76 virtual void RemoveObserver(Observer* observer) override { |
77 observers_.RemoveObserver(observer); | 77 observers_.RemoveObserver(observer); |
78 } | 78 } |
79 | 79 |
80 virtual bool HasObserver(Observer* observer) OVERRIDE { | 80 virtual bool HasObserver(Observer* observer) override { |
81 return observers_.HasObserver(observer); | 81 return observers_.HasObserver(observer); |
82 } | 82 } |
83 | 83 |
84 virtual void DecreaseScreenBrightness(bool allow_off) OVERRIDE { | 84 virtual void DecreaseScreenBrightness(bool allow_off) override { |
85 dbus::MethodCall method_call( | 85 dbus::MethodCall method_call( |
86 power_manager::kPowerManagerInterface, | 86 power_manager::kPowerManagerInterface, |
87 power_manager::kDecreaseScreenBrightnessMethod); | 87 power_manager::kDecreaseScreenBrightnessMethod); |
88 dbus::MessageWriter writer(&method_call); | 88 dbus::MessageWriter writer(&method_call); |
89 writer.AppendBool(allow_off); | 89 writer.AppendBool(allow_off); |
90 power_manager_proxy_->CallMethod( | 90 power_manager_proxy_->CallMethod( |
91 &method_call, | 91 &method_call, |
92 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 92 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
93 dbus::ObjectProxy::EmptyResponseCallback()); | 93 dbus::ObjectProxy::EmptyResponseCallback()); |
94 } | 94 } |
95 | 95 |
96 virtual void IncreaseScreenBrightness() OVERRIDE { | 96 virtual void IncreaseScreenBrightness() override { |
97 SimpleMethodCallToPowerManager( | 97 SimpleMethodCallToPowerManager( |
98 power_manager::kIncreaseScreenBrightnessMethod); | 98 power_manager::kIncreaseScreenBrightnessMethod); |
99 } | 99 } |
100 | 100 |
101 virtual void DecreaseKeyboardBrightness() OVERRIDE { | 101 virtual void DecreaseKeyboardBrightness() override { |
102 SimpleMethodCallToPowerManager( | 102 SimpleMethodCallToPowerManager( |
103 power_manager::kDecreaseKeyboardBrightnessMethod); | 103 power_manager::kDecreaseKeyboardBrightnessMethod); |
104 } | 104 } |
105 | 105 |
106 virtual void IncreaseKeyboardBrightness() OVERRIDE { | 106 virtual void IncreaseKeyboardBrightness() override { |
107 SimpleMethodCallToPowerManager( | 107 SimpleMethodCallToPowerManager( |
108 power_manager::kIncreaseKeyboardBrightnessMethod); | 108 power_manager::kIncreaseKeyboardBrightnessMethod); |
109 } | 109 } |
110 | 110 |
111 virtual void SetScreenBrightnessPercent(double percent, | 111 virtual void SetScreenBrightnessPercent(double percent, |
112 bool gradual) OVERRIDE { | 112 bool gradual) override { |
113 dbus::MethodCall method_call( | 113 dbus::MethodCall method_call( |
114 power_manager::kPowerManagerInterface, | 114 power_manager::kPowerManagerInterface, |
115 power_manager::kSetScreenBrightnessPercentMethod); | 115 power_manager::kSetScreenBrightnessPercentMethod); |
116 dbus::MessageWriter writer(&method_call); | 116 dbus::MessageWriter writer(&method_call); |
117 writer.AppendDouble(percent); | 117 writer.AppendDouble(percent); |
118 writer.AppendInt32( | 118 writer.AppendInt32( |
119 gradual ? | 119 gradual ? |
120 power_manager::kBrightnessTransitionGradual : | 120 power_manager::kBrightnessTransitionGradual : |
121 power_manager::kBrightnessTransitionInstant); | 121 power_manager::kBrightnessTransitionInstant); |
122 power_manager_proxy_->CallMethod( | 122 power_manager_proxy_->CallMethod( |
123 &method_call, | 123 &method_call, |
124 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 124 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
125 dbus::ObjectProxy::EmptyResponseCallback()); | 125 dbus::ObjectProxy::EmptyResponseCallback()); |
126 } | 126 } |
127 | 127 |
128 virtual void GetScreenBrightnessPercent( | 128 virtual void GetScreenBrightnessPercent( |
129 const GetScreenBrightnessPercentCallback& callback) OVERRIDE { | 129 const GetScreenBrightnessPercentCallback& callback) override { |
130 dbus::MethodCall method_call( | 130 dbus::MethodCall method_call( |
131 power_manager::kPowerManagerInterface, | 131 power_manager::kPowerManagerInterface, |
132 power_manager::kGetScreenBrightnessPercentMethod); | 132 power_manager::kGetScreenBrightnessPercentMethod); |
133 power_manager_proxy_->CallMethod( | 133 power_manager_proxy_->CallMethod( |
134 &method_call, | 134 &method_call, |
135 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 135 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
136 base::Bind(&PowerManagerClientImpl::OnGetScreenBrightnessPercent, | 136 base::Bind(&PowerManagerClientImpl::OnGetScreenBrightnessPercent, |
137 weak_ptr_factory_.GetWeakPtr(), callback)); | 137 weak_ptr_factory_.GetWeakPtr(), callback)); |
138 } | 138 } |
139 | 139 |
140 virtual void RequestStatusUpdate() OVERRIDE { | 140 virtual void RequestStatusUpdate() override { |
141 dbus::MethodCall method_call( | 141 dbus::MethodCall method_call( |
142 power_manager::kPowerManagerInterface, | 142 power_manager::kPowerManagerInterface, |
143 power_manager::kGetPowerSupplyPropertiesMethod); | 143 power_manager::kGetPowerSupplyPropertiesMethod); |
144 power_manager_proxy_->CallMethod( | 144 power_manager_proxy_->CallMethod( |
145 &method_call, | 145 &method_call, |
146 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 146 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
147 base::Bind(&PowerManagerClientImpl::OnGetPowerSupplyPropertiesMethod, | 147 base::Bind(&PowerManagerClientImpl::OnGetPowerSupplyPropertiesMethod, |
148 weak_ptr_factory_.GetWeakPtr())); | 148 weak_ptr_factory_.GetWeakPtr())); |
149 } | 149 } |
150 | 150 |
151 virtual void RequestSuspend() OVERRIDE { | 151 virtual void RequestSuspend() override { |
152 SimpleMethodCallToPowerManager(power_manager::kRequestSuspendMethod); | 152 SimpleMethodCallToPowerManager(power_manager::kRequestSuspendMethod); |
153 } | 153 } |
154 | 154 |
155 virtual void RequestRestart() OVERRIDE { | 155 virtual void RequestRestart() override { |
156 SimpleMethodCallToPowerManager(power_manager::kRequestRestartMethod); | 156 SimpleMethodCallToPowerManager(power_manager::kRequestRestartMethod); |
157 } | 157 } |
158 | 158 |
159 virtual void RequestShutdown() OVERRIDE { | 159 virtual void RequestShutdown() override { |
160 SimpleMethodCallToPowerManager(power_manager::kRequestShutdownMethod); | 160 SimpleMethodCallToPowerManager(power_manager::kRequestShutdownMethod); |
161 } | 161 } |
162 | 162 |
163 virtual void NotifyUserActivity( | 163 virtual void NotifyUserActivity( |
164 power_manager::UserActivityType type) OVERRIDE { | 164 power_manager::UserActivityType type) override { |
165 dbus::MethodCall method_call( | 165 dbus::MethodCall method_call( |
166 power_manager::kPowerManagerInterface, | 166 power_manager::kPowerManagerInterface, |
167 power_manager::kHandleUserActivityMethod); | 167 power_manager::kHandleUserActivityMethod); |
168 dbus::MessageWriter writer(&method_call); | 168 dbus::MessageWriter writer(&method_call); |
169 writer.AppendInt32(type); | 169 writer.AppendInt32(type); |
170 | 170 |
171 power_manager_proxy_->CallMethod( | 171 power_manager_proxy_->CallMethod( |
172 &method_call, | 172 &method_call, |
173 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 173 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
174 dbus::ObjectProxy::EmptyResponseCallback()); | 174 dbus::ObjectProxy::EmptyResponseCallback()); |
175 } | 175 } |
176 | 176 |
177 virtual void NotifyVideoActivity(bool is_fullscreen) OVERRIDE { | 177 virtual void NotifyVideoActivity(bool is_fullscreen) override { |
178 dbus::MethodCall method_call( | 178 dbus::MethodCall method_call( |
179 power_manager::kPowerManagerInterface, | 179 power_manager::kPowerManagerInterface, |
180 power_manager::kHandleVideoActivityMethod); | 180 power_manager::kHandleVideoActivityMethod); |
181 dbus::MessageWriter writer(&method_call); | 181 dbus::MessageWriter writer(&method_call); |
182 writer.AppendBool(is_fullscreen); | 182 writer.AppendBool(is_fullscreen); |
183 | 183 |
184 power_manager_proxy_->CallMethod( | 184 power_manager_proxy_->CallMethod( |
185 &method_call, | 185 &method_call, |
186 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 186 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
187 dbus::ObjectProxy::EmptyResponseCallback()); | 187 dbus::ObjectProxy::EmptyResponseCallback()); |
188 } | 188 } |
189 | 189 |
190 virtual void SetPolicy( | 190 virtual void SetPolicy( |
191 const power_manager::PowerManagementPolicy& policy) OVERRIDE { | 191 const power_manager::PowerManagementPolicy& policy) override { |
192 dbus::MethodCall method_call( | 192 dbus::MethodCall method_call( |
193 power_manager::kPowerManagerInterface, | 193 power_manager::kPowerManagerInterface, |
194 power_manager::kSetPolicyMethod); | 194 power_manager::kSetPolicyMethod); |
195 dbus::MessageWriter writer(&method_call); | 195 dbus::MessageWriter writer(&method_call); |
196 if (!writer.AppendProtoAsArrayOfBytes(policy)) { | 196 if (!writer.AppendProtoAsArrayOfBytes(policy)) { |
197 LOG(ERROR) << "Error calling " << power_manager::kSetPolicyMethod; | 197 LOG(ERROR) << "Error calling " << power_manager::kSetPolicyMethod; |
198 return; | 198 return; |
199 } | 199 } |
200 power_manager_proxy_->CallMethod( | 200 power_manager_proxy_->CallMethod( |
201 &method_call, | 201 &method_call, |
202 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 202 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
203 dbus::ObjectProxy::EmptyResponseCallback()); | 203 dbus::ObjectProxy::EmptyResponseCallback()); |
204 } | 204 } |
205 | 205 |
206 virtual void SetIsProjecting(bool is_projecting) OVERRIDE { | 206 virtual void SetIsProjecting(bool is_projecting) override { |
207 dbus::MethodCall method_call( | 207 dbus::MethodCall method_call( |
208 power_manager::kPowerManagerInterface, | 208 power_manager::kPowerManagerInterface, |
209 power_manager::kSetIsProjectingMethod); | 209 power_manager::kSetIsProjectingMethod); |
210 dbus::MessageWriter writer(&method_call); | 210 dbus::MessageWriter writer(&method_call); |
211 writer.AppendBool(is_projecting); | 211 writer.AppendBool(is_projecting); |
212 power_manager_proxy_->CallMethod( | 212 power_manager_proxy_->CallMethod( |
213 &method_call, | 213 &method_call, |
214 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 214 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
215 dbus::ObjectProxy::EmptyResponseCallback()); | 215 dbus::ObjectProxy::EmptyResponseCallback()); |
216 last_is_projecting_ = is_projecting; | 216 last_is_projecting_ = is_projecting; |
217 } | 217 } |
218 | 218 |
219 virtual base::Closure GetSuspendReadinessCallback() OVERRIDE { | 219 virtual base::Closure GetSuspendReadinessCallback() override { |
220 DCHECK(OnOriginThread()); | 220 DCHECK(OnOriginThread()); |
221 DCHECK(suspend_is_pending_); | 221 DCHECK(suspend_is_pending_); |
222 num_pending_suspend_readiness_callbacks_++; | 222 num_pending_suspend_readiness_callbacks_++; |
223 return base::Bind(&PowerManagerClientImpl::HandleObserverSuspendReadiness, | 223 return base::Bind(&PowerManagerClientImpl::HandleObserverSuspendReadiness, |
224 weak_ptr_factory_.GetWeakPtr(), pending_suspend_id_, | 224 weak_ptr_factory_.GetWeakPtr(), pending_suspend_id_, |
225 suspending_from_dark_resume_); | 225 suspending_from_dark_resume_); |
226 } | 226 } |
227 | 227 |
228 virtual int GetNumPendingSuspendReadinessCallbacks() OVERRIDE { | 228 virtual int GetNumPendingSuspendReadinessCallbacks() override { |
229 return num_pending_suspend_readiness_callbacks_; | 229 return num_pending_suspend_readiness_callbacks_; |
230 } | 230 } |
231 | 231 |
232 protected: | 232 protected: |
233 virtual void Init(dbus::Bus* bus) OVERRIDE { | 233 virtual void Init(dbus::Bus* bus) override { |
234 power_manager_proxy_ = bus->GetObjectProxy( | 234 power_manager_proxy_ = bus->GetObjectProxy( |
235 power_manager::kPowerManagerServiceName, | 235 power_manager::kPowerManagerServiceName, |
236 dbus::ObjectPath(power_manager::kPowerManagerServicePath)); | 236 dbus::ObjectPath(power_manager::kPowerManagerServicePath)); |
237 | 237 |
238 power_manager_proxy_->SetNameOwnerChangedCallback( | 238 power_manager_proxy_->SetNameOwnerChangedCallback( |
239 base::Bind(&PowerManagerClientImpl::NameOwnerChangedReceived, | 239 base::Bind(&PowerManagerClientImpl::NameOwnerChangedReceived, |
240 weak_ptr_factory_.GetWeakPtr())); | 240 weak_ptr_factory_.GetWeakPtr())); |
241 | 241 |
242 // Monitor the D-Bus signal for brightness changes. Only the power | 242 // Monitor the D-Bus signal for brightness changes. Only the power |
243 // manager knows the actual brightness level. We don't cache the | 243 // manager knows the actual brightness level. We don't cache the |
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
744 num_pending_suspend_readiness_callbacks_(0), | 744 num_pending_suspend_readiness_callbacks_(0), |
745 weak_ptr_factory_(this) {} | 745 weak_ptr_factory_(this) {} |
746 | 746 |
747 virtual ~PowerManagerClientStubImpl() {} | 747 virtual ~PowerManagerClientStubImpl() {} |
748 | 748 |
749 int num_pending_suspend_readiness_callbacks() const { | 749 int num_pending_suspend_readiness_callbacks() const { |
750 return num_pending_suspend_readiness_callbacks_; | 750 return num_pending_suspend_readiness_callbacks_; |
751 } | 751 } |
752 | 752 |
753 // PowerManagerClient overrides: | 753 // PowerManagerClient overrides: |
754 virtual void Init(dbus::Bus* bus) OVERRIDE { | 754 virtual void Init(dbus::Bus* bus) override { |
755 ParseCommandLineSwitch(); | 755 ParseCommandLineSwitch(); |
756 if (power_cycle_delay_ != base::TimeDelta()) { | 756 if (power_cycle_delay_ != base::TimeDelta()) { |
757 update_timer_.Start(FROM_HERE, | 757 update_timer_.Start(FROM_HERE, |
758 power_cycle_delay_, | 758 power_cycle_delay_, |
759 this, | 759 this, |
760 &PowerManagerClientStubImpl::UpdateStatus); | 760 &PowerManagerClientStubImpl::UpdateStatus); |
761 } | 761 } |
762 } | 762 } |
763 | 763 |
764 virtual void AddObserver(Observer* observer) OVERRIDE { | 764 virtual void AddObserver(Observer* observer) override { |
765 observers_.AddObserver(observer); | 765 observers_.AddObserver(observer); |
766 } | 766 } |
767 | 767 |
768 virtual void RemoveObserver(Observer* observer) OVERRIDE { | 768 virtual void RemoveObserver(Observer* observer) override { |
769 observers_.RemoveObserver(observer); | 769 observers_.RemoveObserver(observer); |
770 } | 770 } |
771 | 771 |
772 virtual bool HasObserver(Observer* observer) OVERRIDE { | 772 virtual bool HasObserver(Observer* observer) override { |
773 return observers_.HasObserver(observer); | 773 return observers_.HasObserver(observer); |
774 } | 774 } |
775 | 775 |
776 virtual void DecreaseScreenBrightness(bool allow_off) OVERRIDE { | 776 virtual void DecreaseScreenBrightness(bool allow_off) override { |
777 VLOG(1) << "Requested to descrease screen brightness"; | 777 VLOG(1) << "Requested to descrease screen brightness"; |
778 SetBrightness(brightness_ - 5.0, true); | 778 SetBrightness(brightness_ - 5.0, true); |
779 } | 779 } |
780 | 780 |
781 virtual void IncreaseScreenBrightness() OVERRIDE { | 781 virtual void IncreaseScreenBrightness() override { |
782 VLOG(1) << "Requested to increase screen brightness"; | 782 VLOG(1) << "Requested to increase screen brightness"; |
783 SetBrightness(brightness_ + 5.0, true); | 783 SetBrightness(brightness_ + 5.0, true); |
784 } | 784 } |
785 | 785 |
786 virtual void SetScreenBrightnessPercent(double percent, | 786 virtual void SetScreenBrightnessPercent(double percent, |
787 bool gradual) OVERRIDE { | 787 bool gradual) override { |
788 VLOG(1) << "Requested to set screen brightness to " << percent << "% " | 788 VLOG(1) << "Requested to set screen brightness to " << percent << "% " |
789 << (gradual ? "gradually" : "instantaneously"); | 789 << (gradual ? "gradually" : "instantaneously"); |
790 SetBrightness(percent, false); | 790 SetBrightness(percent, false); |
791 } | 791 } |
792 | 792 |
793 virtual void GetScreenBrightnessPercent( | 793 virtual void GetScreenBrightnessPercent( |
794 const GetScreenBrightnessPercentCallback& callback) OVERRIDE { | 794 const GetScreenBrightnessPercentCallback& callback) override { |
795 callback.Run(brightness_); | 795 callback.Run(brightness_); |
796 } | 796 } |
797 | 797 |
798 virtual void DecreaseKeyboardBrightness() OVERRIDE { | 798 virtual void DecreaseKeyboardBrightness() override { |
799 VLOG(1) << "Requested to descrease keyboard brightness"; | 799 VLOG(1) << "Requested to descrease keyboard brightness"; |
800 } | 800 } |
801 | 801 |
802 virtual void IncreaseKeyboardBrightness() OVERRIDE { | 802 virtual void IncreaseKeyboardBrightness() override { |
803 VLOG(1) << "Requested to increase keyboard brightness"; | 803 VLOG(1) << "Requested to increase keyboard brightness"; |
804 } | 804 } |
805 | 805 |
806 virtual void RequestStatusUpdate() OVERRIDE { | 806 virtual void RequestStatusUpdate() override { |
807 base::MessageLoop::current()->PostTask(FROM_HERE, | 807 base::MessageLoop::current()->PostTask(FROM_HERE, |
808 base::Bind(&PowerManagerClientStubImpl::UpdateStatus, | 808 base::Bind(&PowerManagerClientStubImpl::UpdateStatus, |
809 weak_ptr_factory_.GetWeakPtr())); | 809 weak_ptr_factory_.GetWeakPtr())); |
810 } | 810 } |
811 | 811 |
812 virtual void RequestSuspend() OVERRIDE {} | 812 virtual void RequestSuspend() override {} |
813 virtual void RequestRestart() OVERRIDE {} | 813 virtual void RequestRestart() override {} |
814 virtual void RequestShutdown() OVERRIDE {} | 814 virtual void RequestShutdown() override {} |
815 | 815 |
816 virtual void NotifyUserActivity( | 816 virtual void NotifyUserActivity( |
817 power_manager::UserActivityType type) OVERRIDE {} | 817 power_manager::UserActivityType type) override {} |
818 virtual void NotifyVideoActivity(bool is_fullscreen) OVERRIDE {} | 818 virtual void NotifyVideoActivity(bool is_fullscreen) override {} |
819 virtual void SetPolicy( | 819 virtual void SetPolicy( |
820 const power_manager::PowerManagementPolicy& policy) OVERRIDE {} | 820 const power_manager::PowerManagementPolicy& policy) override {} |
821 virtual void SetIsProjecting(bool is_projecting) OVERRIDE {} | 821 virtual void SetIsProjecting(bool is_projecting) override {} |
822 virtual base::Closure GetSuspendReadinessCallback() OVERRIDE { | 822 virtual base::Closure GetSuspendReadinessCallback() override { |
823 num_pending_suspend_readiness_callbacks_++; | 823 num_pending_suspend_readiness_callbacks_++; |
824 return base::Bind(&PowerManagerClientStubImpl::HandleSuspendReadiness, | 824 return base::Bind(&PowerManagerClientStubImpl::HandleSuspendReadiness, |
825 weak_ptr_factory_.GetWeakPtr()); | 825 weak_ptr_factory_.GetWeakPtr()); |
826 } | 826 } |
827 virtual int GetNumPendingSuspendReadinessCallbacks() OVERRIDE { | 827 virtual int GetNumPendingSuspendReadinessCallbacks() override { |
828 return num_pending_suspend_readiness_callbacks_; | 828 return num_pending_suspend_readiness_callbacks_; |
829 } | 829 } |
830 | 830 |
831 private: | 831 private: |
832 void HandleSuspendReadiness() { | 832 void HandleSuspendReadiness() { |
833 num_pending_suspend_readiness_callbacks_--; | 833 num_pending_suspend_readiness_callbacks_--; |
834 } | 834 } |
835 | 835 |
836 void UpdateStatus() { | 836 void UpdateStatus() { |
837 if (pause_count_ > 0) { | 837 if (pause_count_ > 0) { |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
959 // static | 959 // static |
960 PowerManagerClient* PowerManagerClient::Create( | 960 PowerManagerClient* PowerManagerClient::Create( |
961 DBusClientImplementationType type) { | 961 DBusClientImplementationType type) { |
962 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) | 962 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) |
963 return new PowerManagerClientImpl(); | 963 return new PowerManagerClientImpl(); |
964 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); | 964 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); |
965 return new PowerManagerClientStubImpl(); | 965 return new PowerManagerClientStubImpl(); |
966 } | 966 } |
967 | 967 |
968 } // namespace chromeos | 968 } // namespace chromeos |
OLD | NEW |