Added quick lock mechanism while in Touchview

ash/wm/maximize_mode/maximize_mode_controller.cc

 // Copyright 2014 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/maximize_mode/maximize_mode_controller.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/maximize_mode/maximize_mode_window_manager.h"
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/time/default_tick_clock.h"
 #include "base/time/tick_clock.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/events/event.h"
-#include "ui/events/event_handler.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/vector3d_f.h"
 
 #if defined(USE_X11)
 #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
 #endif  // OS_CHROMEOS
@@ skipping 70 matching lines @@
   gfx::Vector3dF cross(base);
   cross.Cross(other);
   // If the dot product of this cross product is normal, it means that the
   // shortest angle between |base| and |other| was counterclockwise with respect
   // to the surface represented by |normal| and this angle must be reversed.
   if (gfx::DotProduct(cross, normal) > 0.0f)
     angle = 360.0f - angle;
   return angle;
 }
 
-#if defined(OS_CHROMEOS)
-
-// An event handler which listens for a volume down + power keypress and
-// triggers a screenshot when this is seen.
-class ScreenshotActionHandler : public ui::EventHandler {
- public:
-  ScreenshotActionHandler();
-  virtual ~ScreenshotActionHandler();
-
-  // ui::EventHandler:
-  virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
-
- private:
-  bool volume_down_pressed_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScreenshotActionHandler);
-};
-
-ScreenshotActionHandler::ScreenshotActionHandler()
-    : volume_down_pressed_(false) {
-  Shell::GetInstance()->PrependPreTargetHandler(this);
-}
-
-ScreenshotActionHandler::~ScreenshotActionHandler() {
-  Shell::GetInstance()->RemovePreTargetHandler(this);
-}
-
-void ScreenshotActionHandler::OnKeyEvent(ui::KeyEvent* event) {
-  if (event->key_code() == ui::VKEY_VOLUME_DOWN) {
-    volume_down_pressed_ = event->type() == ui::ET_KEY_PRESSED ||
-                           event->type() == ui::ET_TRANSLATED_KEY_PRESS;
-  } else if (volume_down_pressed_ &&
-             event->key_code() == ui::VKEY_POWER &&
-             event->type() == ui::ET_KEY_PRESSED) {
-    Shell::GetInstance()->accelerator_controller()->PerformAction(
-        ash::TAKE_SCREENSHOT, ui::Accelerator());
-  }
-}
-
-#endif  // OS_CHROMEOS
-
 }  // namespace
 
 MaximizeModeController::MaximizeModeController()
     : rotation_locked_(false),
       have_seen_accelerometer_data_(false),
       ignore_display_configuration_updates_(false),
       shutting_down_(false),
       user_rotation_(gfx::Display::ROTATE_0),
       last_touchview_transition_time_(base::Time::Now()),
       tick_clock_(new base::DefaultTickClock()),
@@ skipping 261 matching lines @@
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (display_manager->HasInternalDisplay()) {
     current_rotation_ = user_rotation_ = display_manager->
         GetDisplayInfo(gfx::Display::InternalDisplayId()).rotation();
     LoadDisplayRotationProperties();
   }
   EnableMaximizeModeWindowManager(true);
 #if defined(USE_X11)
   event_blocker_.reset(new ScopedDisableInternalMouseAndKeyboardX11);
 #endif
-#if defined(OS_CHROMEOS)
-  event_handler_.reset(new ScreenshotActionHandler);
-#endif
   Shell::GetInstance()->display_controller()->AddObserver(this);
 }
 
 void MaximizeModeController::LeaveMaximizeMode() {
   if (!IsMaximizeModeWindowManagerEnabled())
     return;
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   if (display_manager->HasInternalDisplay()) {
     gfx::Display::Rotation current_rotation = display_manager->
         GetDisplayInfo(gfx::Display::InternalDisplayId()).rotation();
     if (current_rotation != user_rotation_)
       SetDisplayRotation(display_manager, user_rotation_);
   }
   if (!shutting_down_)
     SetRotationLocked(false);
   EnableMaximizeModeWindowManager(false);
   event_blocker_.reset();
-  event_handler_.reset();
   Shell::GetInstance()->display_controller()->RemoveObserver(this);
 }
 
 // Called after maximize mode has started, windows might still animate though.
 void MaximizeModeController::OnMaximizeModeStarted() {
   RecordTouchViewStateTransition();
 }
 
 // Called after maximize mode has ended, windows might still be returning to
 // their original position.
@@ skipping 55 matching lines @@
   return elapsed_time <= kLidRecentlyOpenedDuration;
 }
 
 void MaximizeModeController::SetTickClockForTest(
     scoped_ptr<base::TickClock> tick_clock) {
   DCHECK(tick_clock_);
   tick_clock_ = tick_clock.Pass();
 }
 
 }  // namespace ash