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

Side by Side Diff: ash/wm/overlay_event_filter.cc

Issue 10831240: Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge-tot Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/overlay_event_filter.h ('k') | ash/wm/panel_window_event_filter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/overlay_event_filter.h" 5 #include "ash/wm/overlay_event_filter.h"
6 6
7 #include "ash/wm/partial_screenshot_view.h" 7 #include "ash/wm/partial_screenshot_view.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/aura/window_delegate.h" 9 #include "ui/aura/window_delegate.h"
10 #include "ui/base/event.h" 10 #include "ui/base/event.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 aura::Window* target, ui::MouseEvent* event) { 52 aura::Window* target, ui::MouseEvent* event) {
53 if (delegate_) { 53 if (delegate_) {
54 DCHECK_EQ(target, delegate_->GetWindow()); 54 DCHECK_EQ(target, delegate_->GetWindow());
55 target->delegate()->OnMouseEvent(event); 55 target->delegate()->OnMouseEvent(event);
56 return true; 56 return true;
57 } 57 }
58 return false; // Not handled. 58 return false; // Not handled.
59 } 59 }
60 60
61 ui::TouchStatus OverlayEventFilter::PreHandleTouchEvent( 61 ui::TouchStatus OverlayEventFilter::PreHandleTouchEvent(
62 aura::Window* target, ui::TouchEventImpl* event) { 62 aura::Window* target, ui::TouchEvent* event) {
63 return ui::TOUCH_STATUS_UNKNOWN; // Not handled. 63 return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
64 } 64 }
65 65
66 ui::GestureStatus OverlayEventFilter::PreHandleGestureEvent( 66 ui::GestureStatus OverlayEventFilter::PreHandleGestureEvent(
67 aura::Window* target, ui::GestureEventImpl* event) { 67 aura::Window* target, ui::GestureEventImpl* event) {
68 return ui::GESTURE_STATUS_UNKNOWN; // Not handled. 68 return ui::GESTURE_STATUS_UNKNOWN; // Not handled.
69 } 69 }
70 70
71 void OverlayEventFilter::OnLoginStateChanged( 71 void OverlayEventFilter::OnLoginStateChanged(
72 user::LoginStatus status) { 72 user::LoginStatus status) {
(...skipping 15 matching lines...) Expand all
88 void OverlayEventFilter::Deactivate() { 88 void OverlayEventFilter::Deactivate() {
89 delegate_ = NULL; 89 delegate_ = NULL;
90 } 90 }
91 91
92 void OverlayEventFilter::Cancel() { 92 void OverlayEventFilter::Cancel() {
93 if (delegate_) 93 if (delegate_)
94 delegate_->Cancel(); 94 delegate_->Cancel();
95 } 95 }
96 } // namespace internal 96 } // namespace internal
97 } // namespace ash 97 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/overlay_event_filter.h ('k') | ash/wm/panel_window_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698