Revert 155224 - Add is_fullscreen to video updates

chromeos/dbus/power_manager_client.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/power_manager_client.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "chromeos/dbus/power_state_control.pb.h"
 #include "chromeos/dbus/power_supply_properties.pb.h"
-#include "chromeos/dbus/video_activity_update.pb.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 // The PowerManagerClient implementation used in production.
 class PowerManagerClientImpl : public PowerManagerClient {
@@ skipping 189 matching lines @@
         power_manager::kHandleUserActivityMethod);
     dbus::MessageWriter writer(&method_call);
     writer.AppendInt64(last_activity_time.ToInternalValue());
     power_manager_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         dbus::ObjectProxy::EmptyResponseCallback());
   }
 
   virtual void NotifyVideoActivity(
-      const base::TimeTicks& last_activity_time,
-      bool is_fullscreen) OVERRIDE {
+      const base::TimeTicks& last_activity_time) OVERRIDE {
     dbus::MethodCall method_call(
         power_manager::kPowerManagerInterface,
         power_manager::kHandleVideoActivityMethod);
     dbus::MessageWriter writer(&method_call);
-
-    VideoActivityUpdate protobuf;
-    protobuf.set_last_activity_time(last_activity_time.ToInternalValue());
-    protobuf.set_is_fullscreen(is_fullscreen);
-
-    writer.AppendProtoAsArrayOfBytes(protobuf);
+    writer.AppendInt64(last_activity_time.ToInternalValue());
     power_manager_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         dbus::ObjectProxy::EmptyResponseCallback());
   }
 
   virtual void RequestPowerStateOverrides(
       uint32 request_id,
       uint32 duration,
       int overrides,
@@ skipping 339 matching lines @@
 
   virtual void CalculateIdleTime(const CalculateIdleTimeCallback& callback)
       OVERRIDE {
     callback.Run(0);
   }
 
   virtual void RequestIdleNotification(int64 threshold) OVERRIDE {}
   virtual void NotifyUserActivity(
       const base::TimeTicks& last_activity_time) OVERRIDE {}
   virtual void NotifyVideoActivity(
-      const base::TimeTicks& last_activity_time,
-      bool is_fullscreen) OVERRIDE {}
+      const base::TimeTicks& last_activity_time) OVERRIDE {}
   virtual void RequestPowerStateOverrides(
       uint32 request_id,
       uint32 duration,
       int overrides,
       const PowerStateRequestIdCallback& callback) OVERRIDE {}
   virtual void SetIsProjecting(bool is_projecting) OVERRIDE {}
 
   virtual void NotifyScreenLockCompleted() OVERRIDE {}
   virtual void NotifyScreenUnlockCompleted() OVERRIDE {}
 
@@ skipping 54 matching lines @@
 PowerManagerClient* PowerManagerClient::Create(
     DBusClientImplementationType type,
     dbus::Bus* bus) {
   if (type == REAL_DBUS_CLIENT_IMPLEMENTATION)
     return new PowerManagerClientImpl(bus);
   DCHECK_EQ(STUB_DBUS_CLIENT_IMPLEMENTATION, type);
   return new PowerManagerClientStubImpl();
 }
 
 }  // namespace chromeos