diff options
author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 21:51:44 +0000 |
---|---|---|
committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 21:51:44 +0000 |
commit | e72fa4d643005f438978d8a9c21272f3acd64061 (patch) | |
tree | fabd135523ba0954c3c6b861dd21c5e165512580 /ash/display/mouse_cursor_event_filter.h | |
parent | f33386d952654acfad4f62029ece49f0e7ecb200 (diff) | |
download | chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.zip chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.tar.gz chromium_src-e72fa4d643005f438978d8a9c21272f3acd64061.tar.bz2 |
Revert r 144499 "Rename the remaining usage of Monitor to Display"
Temporarily reverting rename change to investigate 133784
TBR=oshima@chromium.org
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10689014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144573 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/mouse_cursor_event_filter.h')
-rw-r--r-- | ash/display/mouse_cursor_event_filter.h | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/ash/display/mouse_cursor_event_filter.h b/ash/display/mouse_cursor_event_filter.h deleted file mode 100644 index a89a6b7..0000000 --- a/ash/display/mouse_cursor_event_filter.h +++ /dev/null @@ -1,44 +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. - -#ifndef ASH_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H -#define ASH_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H -#pragma once - -#include "ash/ash_export.h" -#include "base/compiler_specific.h" -#include "ui/aura/event_filter.h" - -namespace ash { -namespace internal { -class DisplayController; - -// An event filter that controls mouse location in extended desktop -// environment. -class ASH_EXPORT MouseCursorEventFilter : public aura::EventFilter { - public: - MouseCursorEventFilter(DisplayController* display_controller); - virtual ~MouseCursorEventFilter(); - - // Overridden from aura::EventFilter: - virtual bool PreHandleKeyEvent(aura::Window* target, - aura::KeyEvent* event) OVERRIDE; - virtual bool PreHandleMouseEvent(aura::Window* target, - aura::MouseEvent* event) OVERRIDE; - virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target, - aura::TouchEvent* event) OVERRIDE; - virtual ui::GestureStatus PreHandleGestureEvent( - aura::Window* target, - aura::GestureEvent* event) OVERRIDE; - - private: - DisplayController* display_controller_; - - DISALLOW_COPY_AND_ASSIGN(MouseCursorEventFilter); -}; - -} // namespace internal -} // namespace ash - -#endif // ASH_DISPLAY_MOUSE_CURSOR_EVENT_FILTER_H |