Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1481)

Unified Diff: ash/wm/maximize_mode/maximize_mode_controller.cc

Issue 326813004: Added quick lock mechanism while in Touchview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added ASH_EXPORT to SessionStateAnimator Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 6f655b28d9a6b2f82a7bbc26ec3d336c47dd42c8..4351bdb0677f38fe2c8dc3214250985a3e813200 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -19,7 +19,6 @@
#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"
@@ -110,47 +109,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()
@@ -432,9 +390,6 @@ void MaximizeModeController::EnterMaximizeMode() {
#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);
}
@@ -452,7 +407,6 @@ void MaximizeModeController::LeaveMaximizeMode() {
SetRotationLocked(false);
EnableMaximizeModeWindowManager(false);
event_blocker_.reset();
- event_handler_.reset();
Shell::GetInstance()->display_controller()->RemoveObserver(this);
}
« no previous file with comments | « ash/wm/maximize_mode/maximize_mode_controller.h ('k') | ash/wm/maximize_mode/maximize_mode_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698