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" |
11 #include "base/format_macros.h" | 11 #include "base/format_macros.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
14 #include "base/stringprintf.h" | 14 #include "base/stringprintf.h" |
15 #include "base/time.h" | 15 #include "base/time.h" |
16 #include "base/timer.h" | 16 #include "base/timer.h" |
17 #include "chromeos/dbus/power_state_control.pb.h" | 17 #include "chromeos/dbus/power_state_control.pb.h" |
18 #include "chromeos/dbus/power_supply_properties.pb.h" | 18 #include "chromeos/dbus/power_supply_properties.pb.h" |
| 19 #include "chromeos/dbus/video_activity_update.pb.h" |
19 #include "dbus/bus.h" | 20 #include "dbus/bus.h" |
20 #include "dbus/message.h" | 21 #include "dbus/message.h" |
21 #include "dbus/object_path.h" | 22 #include "dbus/object_path.h" |
22 #include "dbus/object_proxy.h" | 23 #include "dbus/object_proxy.h" |
23 #include "third_party/cros_system_api/dbus/service_constants.h" | 24 #include "third_party/cros_system_api/dbus/service_constants.h" |
24 | 25 |
25 namespace chromeos { | 26 namespace chromeos { |
26 | 27 |
27 // The PowerManagerClient implementation used in production. | 28 // The PowerManagerClient implementation used in production. |
28 class PowerManagerClientImpl : public PowerManagerClient { | 29 class PowerManagerClientImpl : public PowerManagerClient { |
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
218 power_manager::kHandleUserActivityMethod); | 219 power_manager::kHandleUserActivityMethod); |
219 dbus::MessageWriter writer(&method_call); | 220 dbus::MessageWriter writer(&method_call); |
220 writer.AppendInt64(last_activity_time.ToInternalValue()); | 221 writer.AppendInt64(last_activity_time.ToInternalValue()); |
221 power_manager_proxy_->CallMethod( | 222 power_manager_proxy_->CallMethod( |
222 &method_call, | 223 &method_call, |
223 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 224 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
224 dbus::ObjectProxy::EmptyResponseCallback()); | 225 dbus::ObjectProxy::EmptyResponseCallback()); |
225 } | 226 } |
226 | 227 |
227 virtual void NotifyVideoActivity( | 228 virtual void NotifyVideoActivity( |
228 const base::TimeTicks& last_activity_time) OVERRIDE { | 229 const base::TimeTicks& last_activity_time, |
| 230 bool is_fullscreen) OVERRIDE { |
229 dbus::MethodCall method_call( | 231 dbus::MethodCall method_call( |
230 power_manager::kPowerManagerInterface, | 232 power_manager::kPowerManagerInterface, |
231 power_manager::kHandleVideoActivityMethod); | 233 power_manager::kHandleVideoActivityMethod); |
232 dbus::MessageWriter writer(&method_call); | 234 dbus::MessageWriter writer(&method_call); |
233 writer.AppendInt64(last_activity_time.ToInternalValue()); | 235 |
| 236 VideoActivityUpdate protobuf; |
| 237 protobuf.set_last_activity_time(last_activity_time.ToInternalValue()); |
| 238 protobuf.set_is_fullscreen(is_fullscreen); |
| 239 |
| 240 writer.AppendProtoAsArrayOfBytes(protobuf); |
234 power_manager_proxy_->CallMethod( | 241 power_manager_proxy_->CallMethod( |
235 &method_call, | 242 &method_call, |
236 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, | 243 dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
237 dbus::ObjectProxy::EmptyResponseCallback()); | 244 dbus::ObjectProxy::EmptyResponseCallback()); |
238 } | 245 } |
239 | 246 |
240 virtual void RequestPowerStateOverrides( | 247 virtual void RequestPowerStateOverrides( |
241 uint32 request_id, | 248 uint32 request_id, |
242 uint32 duration, | 249 uint32 duration, |
243 int overrides, | 250 int overrides, |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 | 590 |
584 virtual void CalculateIdleTime(const CalculateIdleTimeCallback& callback) | 591 virtual void CalculateIdleTime(const CalculateIdleTimeCallback& callback) |
585 OVERRIDE { | 592 OVERRIDE { |
586 callback.Run(0); | 593 callback.Run(0); |
587 } | 594 } |
588 | 595 |
589 virtual void RequestIdleNotification(int64 threshold) OVERRIDE {} | 596 virtual void RequestIdleNotification(int64 threshold) OVERRIDE {} |
590 virtual void NotifyUserActivity( | 597 virtual void NotifyUserActivity( |
591 const base::TimeTicks& last_activity_time) OVERRIDE {} | 598 const base::TimeTicks& last_activity_time) OVERRIDE {} |
592 virtual void NotifyVideoActivity( | 599 virtual void NotifyVideoActivity( |
593 const base::TimeTicks& last_activity_time) OVERRIDE {} | 600 const base::TimeTicks& last_activity_time, |
| 601 bool is_fullscreen) OVERRIDE {} |
594 virtual void RequestPowerStateOverrides( | 602 virtual void RequestPowerStateOverrides( |
595 uint32 request_id, | 603 uint32 request_id, |
596 uint32 duration, | 604 uint32 duration, |
597 int overrides, | 605 int overrides, |
598 const PowerStateRequestIdCallback& callback) OVERRIDE {} | 606 const PowerStateRequestIdCallback& callback) OVERRIDE {} |
599 virtual void SetIsProjecting(bool is_projecting) OVERRIDE {} | 607 virtual void SetIsProjecting(bool is_projecting) OVERRIDE {} |
600 | 608 |
601 virtual void NotifyScreenLockCompleted() OVERRIDE {} | 609 virtual void NotifyScreenLockCompleted() OVERRIDE {} |
602 virtual void NotifyScreenUnlockCompleted() OVERRIDE {} | 610 virtual void NotifyScreenUnlockCompleted() OVERRIDE {} |
603 | 611 |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
658 PowerManagerClient* PowerManagerClient::Create( | 666 PowerManagerClient* PowerManagerClient::Create( |
659 DBusClientImplementationType type, | 667 DBusClientImplementationType type, |
660 dbus::Bus* bus) { | 668 dbus::Bus* bus) { |
661 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) | 669 if (type == REAL_DBUS_CLIENT_IMPLEMENTATION) |
662 return new PowerManagerClientImpl(bus); | 670 return new PowerManagerClientImpl(bus); |
663 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); | 671 DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type); |
664 return new PowerManagerClientStubImpl(); | 672 return new PowerManagerClientStubImpl(); |
665 } | 673 } |
666 | 674 |
667 } // namespace chromeos | 675 } // namespace chromeos |
OLD | NEW |