chromeos: Request screen lock directly from session manager.

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/metrics/histogram.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 "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 {
  public:
-  enum LockScreensState {
-    LOCK_SCREEN_REQUESTED,  // Lock screen is requested.
-    LOCK_SCREEN_REQUEST_SUCCEEDED,  // Method call succeeded.
-    LOCK_SCREEN_REQUEST_FAILED,  // Method call failed.
-    LOCK_SCREEN_FINISHED,  // Signal is received.
-    NUM_LOCK_SCREEN_STATES
-  };
-
-  enum UnlockScreensState {
-    UNLOCK_SCREEN_REQUESTED,  // Unlock screen is requested.
-    UNLOCK_SCREEN_REQUEST_SUCCEEDED,  // Method call succeeded.
-    UNLOCK_SCREEN_REQUEST_FAILED,  // Method call failed.
-    UNLOCK_SCREEN_FINISHED,  // Signal is received.
-    NUM_UNLOCK_SCREEN_STATES
-  };
-
   explicit PowerManagerClientImpl(dbus::Bus* bus)
       : power_manager_proxy_(NULL),
-        screen_locked_(false),
         weak_ptr_factory_(this) {
     power_manager_proxy_ = bus->GetObjectProxy(
         power_manager::kPowerManagerServiceName,
         dbus::ObjectPath(power_manager::kPowerManagerServicePath));
 
     session_manager_proxy_ = bus->GetObjectProxy(
         login_manager::kSessionManagerServiceName,
         dbus::ObjectPath(login_manager::kSessionManagerServicePath));
 
     // Monitor the D-Bus signal for brightness changes. Only the power
@@ skipping 32 matching lines @@
                    weak_ptr_factory_.GetWeakPtr()));
 
     power_manager_proxy_->ConnectToSignal(
         power_manager::kPowerManagerInterface,
         power_manager::kButtonEventSignal,
         base::Bind(&PowerManagerClientImpl::ButtonEventSignalReceived,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&PowerManagerClientImpl::SignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
 
-    session_manager_proxy_->ConnectToSignal(
-        chromium::kChromiumInterface,
-        chromium::kLockScreenSignal,
-        base::Bind(&PowerManagerClientImpl::ScreenLockSignalReceived,
-                   weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&PowerManagerClientImpl::SignalConnected,
-                   weak_ptr_factory_.GetWeakPtr()));
-
-    session_manager_proxy_->ConnectToSignal(
-        chromium::kChromiumInterface,
-        chromium::kUnlockScreenSignal,
-        base::Bind(&PowerManagerClientImpl::ScreenUnlockSignalReceived,
-                   weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&PowerManagerClientImpl::SignalConnected,
-                   weak_ptr_factory_.GetWeakPtr()));
-
     power_manager_proxy_->ConnectToSignal(
         power_manager::kPowerManagerInterface,
         power_manager::kIdleNotifySignal,
         base::Bind(&PowerManagerClientImpl::IdleNotifySignalReceived,
                    weak_ptr_factory_.GetWeakPtr()),
         base::Bind(&PowerManagerClientImpl::SignalConnected,
                    weak_ptr_factory_.GetWeakPtr()));
 
     power_manager_proxy_->ConnectToSignal(
         power_manager::kPowerManagerInterface,
@@ skipping 164 matching lines @@
     protobuf.set_disable_lid_suspend(overrides & DISABLE_IDLE_LID_SUSPEND);
 
     writer.AppendProtoAsArrayOfBytes(protobuf);
     power_manager_proxy_->CallMethod(
         &method_call,
         dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
         base::Bind(&PowerManagerClientImpl::OnPowerStateOverride,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
-  virtual void NotifyScreenLockRequested() OVERRIDE {
-    dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
-                                 power_manager::kRequestLockScreenMethod);
-    UMA_HISTOGRAM_ENUMERATION("LockScreen.LockScreenPath",
-                              LOCK_SCREEN_REQUESTED,
-                              NUM_LOCK_SCREEN_STATES);
-    power_manager_proxy_->CallMethodWithErrorCallback(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&PowerManagerClientImpl::OnScreenLockRequested,
-                   weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&PowerManagerClientImpl::OnScreenLockRequestedError,
-                   weak_ptr_factory_.GetWeakPtr()));
-  }
-
   virtual void NotifyScreenLockCompleted() OVERRIDE {
     SimpleMethodCallToPowerManager(power_manager::kScreenIsLockedMethod);
   }
 
-  virtual void NotifyScreenUnlockRequested() OVERRIDE {
-    dbus::MethodCall method_call(power_manager::kPowerManagerInterface,
-                                 power_manager::kRequestUnlockScreenMethod);
-    UMA_HISTOGRAM_ENUMERATION("LockScreen.UnlockScreenPath",
-                              UNLOCK_SCREEN_REQUESTED,
-                              NUM_UNLOCK_SCREEN_STATES);
-    power_manager_proxy_->CallMethodWithErrorCallback(
-        &method_call,
-        dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-        base::Bind(&PowerManagerClientImpl::OnScreenUnlockRequested,
-                   weak_ptr_factory_.GetWeakPtr()),
-        base::Bind(&PowerManagerClientImpl::OnScreenUnlockRequestedError,
-                   weak_ptr_factory_.GetWeakPtr()));
-  }
-
   virtual void NotifyScreenUnlockCompleted() OVERRIDE {
     SimpleMethodCallToPowerManager(power_manager::kScreenIsUnlockedMethod);
   }
 
-  virtual bool GetIsScreenLocked() OVERRIDE {
-    return screen_locked_;
-  }
-
  private:
   // Called when a dbus signal is initially connected.
   void SignalConnected(const std::string& interface_name,
                        const std::string& signal_name,
                        bool success) {
     LOG_IF(WARNING, !success) << "Failed to connect to signal "
                               << signal_name << ".";
   }
 
   // Make a method call to power manager with no arguments and no response.
@@ skipping 142 matching lines @@
     if (!reader.PopUint32(&request_id)) {
       LOG(ERROR) << "Error reading response from powerd: "
                  << response->ToString();
       callback.Run(0);
       return;
     }
 
     callback.Run(request_id);
   }
 
-  void OnScreenLockRequested(dbus::Response* response) {
-    UMA_HISTOGRAM_ENUMERATION("LockScreen.LockScreenPath",
-                              LOCK_SCREEN_REQUEST_SUCCEEDED,
-                              NUM_LOCK_SCREEN_STATES);
-  }
-
-  void OnScreenLockRequestedError(dbus::ErrorResponse* error_response) {
-    if (error_response) {
-      dbus::MessageReader reader(error_response);
-      std::string error_message;
-      reader.PopString(&error_message);
-      LOG(ERROR) << "Failed to call ScreenLockRequested: "
-                 << error_response->GetErrorName()
-                 << ": " << error_message;
-    }
-    UMA_HISTOGRAM_ENUMERATION("LockScreen.LockScreenPath",
-                              LOCK_SCREEN_REQUEST_FAILED,
-                              NUM_LOCK_SCREEN_STATES);
-  }
-
-  void OnScreenUnlockRequested(dbus::Response* response) {
-    UMA_HISTOGRAM_ENUMERATION("LockScreen.UnlockScreenPath",
-                              UNLOCK_SCREEN_REQUEST_SUCCEEDED,
-                              NUM_UNLOCK_SCREEN_STATES);
-  }
-
-  void OnScreenUnlockRequestedError(dbus::ErrorResponse* error_response) {
-    if (error_response) {
-      dbus::MessageReader reader(error_response);
-      std::string error_message;
-      reader.PopString(&error_message);
-      LOG(ERROR) << "Failed to call ScreenUnlockRequested: "
-                 << error_response->GetErrorName()
-                 << ": " << error_message;
-    }
-    UMA_HISTOGRAM_ENUMERATION("LockScreen.UnlockScreenPath",
-                              UNLOCK_SCREEN_REQUEST_FAILED,
-                              NUM_UNLOCK_SCREEN_STATES);
-  }
-
-
   void OnGetScreenBrightnessPercent(
       const GetScreenBrightnessPercentCallback& callback,
       dbus::Response* response) {
     if (!response) {
       LOG(ERROR) << "Error calling "
                  << power_manager::kGetScreenBrightnessPercent;
       return;
     }
     dbus::MessageReader reader(response);
     double percent = 0.0;
     if (!reader.PopDouble(&percent))
       LOG(ERROR) << "Error reading response from powerd: "
                  << response->ToString();
     callback.Run(percent);
   }
 
-  void ScreenLockSignalReceived(dbus::Signal* signal) {
-    // TODO(flackr): This warning is actually a signal that things are working
-    // as expected. As per http://crbug.com/126217, this will help determine
-    // if the problem is with dbus or in chrome.
-    LOG(WARNING) << "LockScreen signal received from power manager.";
-    screen_locked_ = true;
-    UMA_HISTOGRAM_ENUMERATION("LockScreen.LockScreenPath",
-                              LOCK_SCREEN_FINISHED,
-                              NUM_LOCK_SCREEN_STATES);
-    FOR_EACH_OBSERVER(Observer, observers_, LockScreen());
-  }
-
-  void ScreenUnlockSignalReceived(dbus::Signal* signal) {
-    screen_locked_ = false;
-    UMA_HISTOGRAM_ENUMERATION("LockScreen.UnlockScreenPath",
-                              UNLOCK_SCREEN_FINISHED,
-                              NUM_UNLOCK_SCREEN_STATES);
-    FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen());
-  }
-
   void IdleNotifySignalReceived(dbus::Signal* signal) {
     dbus::MessageReader reader(signal);
     int64 threshold = 0;
     if (!reader.PopInt64(&threshold)) {
       LOG(ERROR) << "Idle Notify signal had incorrect parameters: "
                  << signal->ToString();
       return;
     }
     DCHECK_GT(threshold, 0);
 
@@ skipping 34 matching lines @@
         break;
       default:
         LOG(ERROR) << "Unhandled screen dimming state " << signal_state;
     }
     FOR_EACH_OBSERVER(Observer, observers_, ScreenDimmingRequested(state));
   }
 
   dbus::ObjectProxy* power_manager_proxy_;
   dbus::ObjectProxy* session_manager_proxy_;
   ObserverList<Observer> observers_;
-  bool screen_locked_;
   base::WeakPtrFactory<PowerManagerClientImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PowerManagerClientImpl);
 };
 
 // The PowerManagerClient implementation used on Linux desktop,
 // which does nothing.
 class PowerManagerClientStubImpl : public PowerManagerClient {
  public:
   PowerManagerClientStubImpl()
       : discharging_(true),
         battery_percentage_(40),
         brightness_(50.0),
-        pause_count_(2),
-        screen_locked_(false) {
+        pause_count_(2) {
   }
 
   virtual ~PowerManagerClientStubImpl() {}
 
   // PowerManagerClient overrides:
 
   virtual void AddObserver(Observer* observer) OVERRIDE {
     observers_.AddObserver(observer);
   }
 
@@ skipping 56 matching lines @@
   virtual void NotifyUserActivity(
       const base::TimeTicks& last_activity_time) OVERRIDE {}
   virtual void NotifyVideoActivity(
       const base::TimeTicks& last_activity_time) OVERRIDE {}
   virtual void RequestPowerStateOverrides(
       uint32 request_id,
       uint32 duration,
       int overrides,
       const PowerStateRequestIdCallback& callback) OVERRIDE {}
 
-  virtual void NotifyScreenLockRequested() OVERRIDE {
-    screen_locked_ = true;
-    FOR_EACH_OBSERVER(Observer, observers_, LockScreen());
-  }
   virtual void NotifyScreenLockCompleted() OVERRIDE {}
-  virtual void NotifyScreenUnlockRequested() OVERRIDE {
-    screen_locked_ = false;
-    FOR_EACH_OBSERVER(Observer, observers_, UnlockScreen());
-  }
   virtual void NotifyScreenUnlockCompleted() OVERRIDE {}
-  virtual bool GetIsScreenLocked() OVERRIDE {
-    return screen_locked_;
-  }
 
  private:
   void Update() {
     if (pause_count_ > 0) {
       pause_count_--;
     } else {
       int discharge_amt = battery_percentage_ <= 10 ? 1 : 10;
       battery_percentage_ += (discharging_ ? -discharge_amt : discharge_amt);
       battery_percentage_ = std::min(std::max(battery_percentage_, 0), 100);
       // We pause at 0 and 100% so that it's easier to check those conditions.
@@ skipping 27 matching lines @@
                       BrightnessChanged(brightness_level, user_initiated));
   }
 
   bool discharging_;
   int battery_percentage_;
   double brightness_;
   int pause_count_;
   ObserverList<Observer> observers_;
   base::RepeatingTimer<PowerManagerClientStubImpl> timer_;
   PowerSupplyStatus status_;
-  bool screen_locked_;
 };
 
 PowerManagerClient::PowerManagerClient() {
 }
 
 PowerManagerClient::~PowerManagerClient() {
 }
 
 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