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

ash/wm/power_button_controller.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 "ash/wm/power_button_controller.h"
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/ash_switches.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/wm/lock_state_controller.h"
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/types/display_snapshot.h"
+#include "ui/events/event_handler.h"
 #include "ui/wm/core/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/common/system/chromeos/audio/tray_audio.h"
-#include "ash/system/chromeos/power/tablet_power_button_controller.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif
 
 namespace ash {
 
 PowerButtonController::PowerButtonController(LockStateController* controller)
     : power_button_down_(false),
       lock_button_down_(false),
       volume_down_pressed_(false),
 #if defined(OS_CHROMEOS)
       volume_percent_before_screenshot_(0),
 #endif
       brightness_is_zero_(false),
       internal_display_off_and_external_display_on_(false),
       has_legacy_power_button_(
           base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kAuraLegacyPowerButton)),
-      lock_state_controller_(controller) {
+#if defined(OS_CHROMEOS)
+      enable_quick_lock_(base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAshEnableTouchView)),
+#else
+      enable_quick_lock_(false),
+#endif
+      controller_(controller) {
 #if defined(OS_CHROMEOS)
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
       this);
-  tablet_controller_.reset(
-      new TabletPowerButtonController(lock_state_controller_));
   Shell::GetInstance()->display_configurator()->AddObserver(this);
 #endif
   Shell::GetInstance()->PrependPreTargetHandler(this);
 }
 
 PowerButtonController::~PowerButtonController() {
   Shell::GetInstance()->RemovePreTargetHandler(this);
 #if defined(OS_CHROMEOS)
   Shell::GetInstance()->display_configurator()->RemoveObserver(this);
-  tablet_controller_.reset();
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
       this);
 #endif
 }
 
 void PowerButtonController::OnScreenBrightnessChanged(double percent) {
   brightness_is_zero_ = percent <= 0.001;
 }
 
 void PowerButtonController::OnPowerButtonEvent(
     bool down,
     const base::TimeTicks& timestamp) {
   power_button_down_ = down;
 
-  if (lock_state_controller_->ShutdownRequested())
+  if (controller_->ShutdownRequested())
     return;
 
-#if defined(OS_CHROMEOS)
-  bool should_take_screenshot = down && volume_down_pressed_ &&
-                                WmShell::Get()
-                                    ->maximize_mode_controller()
-                                    ->IsMaximizeModeWindowManagerEnabled();
-
-  if (!has_legacy_power_button_ && !should_take_screenshot &&
-      tablet_controller_->ShouldHandlePowerButtonEvents()) {
-    tablet_controller_->OnPowerButtonEvent(down, timestamp);
-    return;
-  }
-#endif
-
   // Avoid starting the lock/shutdown sequence if the power button is pressed
   // while the screen is off (http://crbug.com/128451), unless an external
   // display is still on (http://crosbug.com/p/24912).
   if (brightness_is_zero_ && !internal_display_off_and_external_display_on_)
     return;
 
 #if defined(OS_CHROMEOS)
   // Take screenshot on power button down plus volume down when in touch view.
-  if (should_take_screenshot) {
+  if (volume_down_pressed_ && down &&
+      WmShell::Get()
+          ->maximize_mode_controller()
+          ->IsMaximizeModeWindowManagerEnabled()) {
     SystemTray* system_tray = Shell::GetInstance()->GetPrimarySystemTray();
     if (system_tray && system_tray->GetTrayAudio())
       system_tray->GetTrayAudio()->HideDetailedView(false);
 
     WmShell::Get()->accelerator_controller()->PerformActionIfEnabled(
         TAKE_SCREENSHOT);
 
     // Restore volume.
     chromeos::CrasAudioHandler* audio_handler =
         chromeos::CrasAudioHandler::Get();
     audio_handler->SetOutputVolumePercentWithoutNotifyingObservers(
         volume_percent_before_screenshot_,
         chromeos::CrasAudioHandler::VOLUME_CHANGE_MAXIMIZE_MODE_SCREENSHOT);
     return;
   }
 #endif  // defined(OS_CHROMEOS)
 
   const SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   if (has_legacy_power_button_) {
     // If power button releases won't get reported correctly because we're not
     // running on official hardware, just lock the screen or shut down
     // immediately.
     if (down) {
       if (session_state_delegate->CanLockScreen() &&
           !session_state_delegate->IsUserSessionBlocked() &&
-          !lock_state_controller_->LockRequested()) {
-        lock_state_controller_->StartLockAnimationAndLockImmediately(false);
+          !controller_->LockRequested()) {
+        controller_->StartLockAnimationAndLockImmediately(false);
       } else {
-        lock_state_controller_->RequestShutdown();
+        controller_->RequestShutdown();
       }
     }
   } else {  // !has_legacy_power_button_
     if (down) {
       // If we already have a pending request to lock the screen, wait.
-      if (lock_state_controller_->LockRequested())
+      if (controller_->LockRequested())
         return;
 
       if (session_state_delegate->CanLockScreen() &&
           !session_state_delegate->IsUserSessionBlocked()) {
-        lock_state_controller_->StartLockAnimation(true);
+        if (WmShell::Get()
+                ->maximize_mode_controller()
+                ->IsMaximizeModeWindowManagerEnabled() &&
+            enable_quick_lock_)
+          controller_->StartLockAnimationAndLockImmediately(true);
+        else
+          controller_->StartLockAnimation(true);
       } else {
-        lock_state_controller_->StartShutdownAnimation();
+        controller_->StartShutdownAnimation();
       }
     } else {  // Button is up.
-      if (lock_state_controller_->CanCancelLockAnimation())
-        lock_state_controller_->CancelLockAnimation();
-      else if (lock_state_controller_->CanCancelShutdownAnimation())
-        lock_state_controller_->CancelShutdownAnimation();
+      if (controller_->CanCancelLockAnimation())
+        controller_->CancelLockAnimation();
+      else if (controller_->CanCancelShutdownAnimation())
+        controller_->CancelShutdownAnimation();
     }
   }
 }
 
 void PowerButtonController::OnLockButtonEvent(
     bool down,
     const base::TimeTicks& timestamp) {
   lock_button_down_ = down;
 
   const SessionStateDelegate* session_state_delegate =
       WmShell::Get()->GetSessionStateDelegate();
   if (!session_state_delegate->CanLockScreen() ||
       session_state_delegate->IsScreenLocked() ||
-      lock_state_controller_->LockRequested() ||
-      lock_state_controller_->ShutdownRequested()) {
+      controller_->LockRequested() || controller_->ShutdownRequested()) {
     return;
   }
 
   // Give the power button precedence over the lock button.
   if (power_button_down_)
     return;
 
   if (down)
-    lock_state_controller_->StartLockAnimation(false);
+    controller_->StartLockAnimation(false);
   else
-    lock_state_controller_->CancelLockAnimation();
+    controller_->CancelLockAnimation();
 }
 
 void PowerButtonController::OnKeyEvent(ui::KeyEvent* event) {
   if (event->key_code() == ui::VKEY_VOLUME_DOWN) {
     volume_down_pressed_ = event->type() == ui::ET_KEY_PRESSED;
 #if defined(OS_CHROMEOS)
     if (!event->is_repeat()) {
       chromeos::CrasAudioHandler* audio_handler =
           chromeos::CrasAudioHandler::Get();
       volume_percent_before_screenshot_ =
@@ skipping 21 matching lines @@
 }
 
 void PowerButtonController::PowerButtonEventReceived(
     bool down,
     const base::TimeTicks& timestamp) {
   OnPowerButtonEvent(down, timestamp);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash