Tablet-like power button behavior on Convertible/Tablet ChromeOS devices

ash/wm/power_button_controller.h

 // 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.
 
 #ifndef ASH_WM_POWER_BUTTON_CONTROLLER_H_
 #define ASH_WM_POWER_BUTTON_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "ui/events/event_handler.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/power_manager_client.h"
 #include "ui/display/chromeos/display_configurator.h"
 #endif
 
 namespace gfx {
 class Rect;
 class Size;
 }
 
 namespace ui {
 class Layer;
 }
 
 namespace ash {
 
+class LockStateController;
+#if defined(OS_CHROMEOS)
+class TabletPowerButtonController;
+#endif
+
 namespace test {
-class PowerButtonControllerTest;
+class TabletPowerButtonControllerTest;

[Daniel Erat, 2016/11/07 20:54:41]

this should also be declared for OS_CHROMEOS

[Qiang(Joe) Xu, 2016/11/10 22:18:44]

done by removing this.

 }
 
-class LockStateController;
-
 // Handles power & lock button events which may result in the locking or
 // shutting down of the system as well as taking screen shots while in maximize
 // mode.
 class ASH_EXPORT PowerButtonController
     : public ui::EventHandler
 // TODO(derat): Remove these ifdefs after DisplayConfigurator becomes
 // cross-platform.
 #if defined(OS_CHROMEOS)
       ,
       public ui::DisplayConfigurator::Observer,
@@ skipping 26 matching lines @@
   // Overriden from ui::DisplayConfigurator::Observer:
   void OnDisplayModeChanged(
       const ui::DisplayConfigurator::DisplayStateList& outputs) override;
 
   // Overridden from chromeos::PowerManagerClient::Observer:
   void PowerButtonEventReceived(bool down,
                                 const base::TimeTicks& timestamp) override;
 #endif
 
  private:
-  friend class test::PowerButtonControllerTest;
+  friend class test::TabletPowerButtonControllerTest;

[Daniel Erat, 2016/11/07 20:54:41]

this seems strange. why do the tests for the TabletPowerButtonController class
need to mess with the internals of PowerButtonController?

[Qiang(Joe) Xu, 2016/11/10 22:18:44]

It is to get the access to |tablet_controller_|. I am removing this because now
I make the TabletPowerButtonController created in PowerButtonController and
static GetInstance in test.

 
   // Are the power or lock buttons currently held?
   bool power_button_down_;
   bool lock_button_down_;
 
   // True when the volume down button is being held down.
   bool volume_down_pressed_;
 
 #if defined(OS_CHROMEOS)
   // Volume to be restored after a screenshot is taken by pressing the power
@@ skipping 11 matching lines @@
 
   // Was a command-line switch set telling us that we're running on hardware
   // that misreports power button releases?
   bool has_legacy_power_button_;
 
   // Enables quick, non-cancellable locking of the screen when in maximize mode.
   bool enable_quick_lock_;
 
   LockStateController* controller_;  // Not owned.
 
+#if defined(OS_CHROMEOS)
+  // When device is convertible/tablet, pass the OnPowerButtonEvent to

[Daniel Erat, 2016/11/07 20:54:41]

nit: "// Handles events for convertible/tablet devices."

[Qiang(Joe) Xu, 2016/11/10 22:18:44]

Done.

+  // |tablet_controller_| when it should be handled there.
+  std::unique_ptr<TabletPowerButtonController> tablet_controller_;
+#endif
+
   DISALLOW_COPY_AND_ASSIGN(PowerButtonController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_POWER_BUTTON_CONTROLLER_H_