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

Unified Diff: ash/wm/partial_screenshot_event_filter.cc

Issue 10825026: Make accelerators not to work when the keyboard overlay is shown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments Created 8 years, 5 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
« no previous file with comments | « ash/wm/partial_screenshot_event_filter.h ('k') | ash/wm/partial_screenshot_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/partial_screenshot_event_filter.cc
diff --git a/ash/wm/partial_screenshot_event_filter.cc b/ash/wm/partial_screenshot_event_filter.cc
deleted file mode 100644
index f70ae05b8bc26d146adb1a215b5005047bba820a..0000000000000000000000000000000000000000
--- a/ash/wm/partial_screenshot_event_filter.cc
+++ /dev/null
@@ -1,91 +0,0 @@
-// 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/partial_screenshot_event_filter.h"
-
-#include "ash/wm/partial_screenshot_view.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_delegate.h"
-#include "ui/views/widget/widget.h"
-
-namespace ash {
-namespace internal {
-
-PartialScreenshotEventFilter::PartialScreenshotEventFilter()
- : view_(NULL) {
-}
-
-PartialScreenshotEventFilter::~PartialScreenshotEventFilter() {
- view_ = NULL;
-}
-
-bool PartialScreenshotEventFilter::PreHandleKeyEvent(
- aura::Window* target, aura::KeyEvent* event) {
- if (!view_)
- return false;
-
- // Do not consume a translated key event which is generated by an IME (e.g.,
- // ui::VKEY_PROCESSKEY) since the key event is generated in response to a key
- // press or release before showing the screenshot view. This is important not
- // to confuse key event handling JavaScript code in a page.
- if (event->type() == ui::ET_TRANSLATED_KEY_PRESS ||
- event->type() == ui::ET_TRANSLATED_KEY_RELEASE) {
- return false;
- }
-
- if (event->key_code() == ui::VKEY_ESCAPE)
- Cancel();
-
- // Always handled: other windows shouldn't receive input while we're
- // taking a screenshot.
- return true;
-}
-
-bool PartialScreenshotEventFilter::PreHandleMouseEvent(
- aura::Window* target, aura::MouseEvent* event) {
- if (view_) {
- DCHECK_EQ(target, view_->GetWidget()->GetNativeWindow());
- target->delegate()->OnMouseEvent(event);
- return true;
- }
- return false; // Not handled.
-}
-
-ui::TouchStatus PartialScreenshotEventFilter::PreHandleTouchEvent(
- aura::Window* target, aura::TouchEvent* event) {
- return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
-}
-
-ui::GestureStatus PartialScreenshotEventFilter::PreHandleGestureEvent(
- aura::Window* target, aura::GestureEvent* event) {
- return ui::GESTURE_STATUS_UNKNOWN; // Not handled.
-}
-
-void PartialScreenshotEventFilter::OnLoginStateChanged(
- user::LoginStatus status) {
- Cancel();
-}
-
-void PartialScreenshotEventFilter::OnAppTerminating() {
- Cancel();
-}
-
-void PartialScreenshotEventFilter::OnLockStateChanged(bool locked) {
- Cancel();
-}
-
-void PartialScreenshotEventFilter::Activate(PartialScreenshotView* view) {
- view_ = view;
-}
-
-void PartialScreenshotEventFilter::Deactivate() {
- view_ = NULL;
-}
-
-void PartialScreenshotEventFilter::Cancel() {
- if (view_)
- view_->Cancel();
-}
-} // namespace internal
-} // namespace ash
« no previous file with comments | « ash/wm/partial_screenshot_event_filter.h ('k') | ash/wm/partial_screenshot_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698