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

ash/wm/power_button_controller.h

Index: ash/wm/power_button_controller.h
diff --git a/ash/wm/power_button_controller.h b/ash/wm/power_button_controller.h
index 7043966f92a9d439ef664804e47343fab0d6804c..4e3741ebf0014c85d01f7e729404c0715fd34b7e 100644
--- a/ash/wm/power_button_controller.h
+++ b/ash/wm/power_button_controller.h
@@ -26,12 +26,15 @@ 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.
@@ -78,7 +81,7 @@ class ASH_EXPORT PowerButtonController
 #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_;
@@ -110,6 +113,12 @@ class ASH_EXPORT PowerButtonController
 
   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);
 };