| Index: ash/wm/maximize_mode/maximize_mode_controller.cc
|
| diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| index a32812ab46688111e7ac0db0724142e5431a6dc9..076e064f5689e2cb861e772eafe5631dc3c699b7 100644
|
| --- a/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| +++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
|
| @@ -17,7 +17,6 @@
|
| #include "base/metrics/histogram.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"
|
|
|
| @@ -92,47 +91,6 @@ float ClockwiseAngleBetweenVectorsInDegrees(const gfx::Vector3dF& base,
|
| 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()
|
| @@ -351,9 +309,6 @@ void MaximizeModeController::EnterMaximizeMode() {
|
| GetDisplayInfo(gfx::Display::InternalDisplayId()).rotation();
|
| EnableMaximizeModeWindowManager(true);
|
| event_blocker_.reset(new MaximizeModeEventBlocker);
|
| -#if defined(OS_CHROMEOS)
|
| - event_handler_.reset(new ScreenshotActionHandler);
|
| -#endif
|
| Shell::GetInstance()->display_controller()->AddObserver(this);
|
| }
|
|
|
| @@ -366,7 +321,6 @@ void MaximizeModeController::LeaveMaximizeMode() {
|
| rotation_locked_ = false;
|
| EnableMaximizeModeWindowManager(false);
|
| event_blocker_.reset();
|
| - event_handler_.reset();
|
| }
|
|
|
| void MaximizeModeController::OnSuspend() {
|
|
|