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

Side by Side Diff: ash/wm/app_list_controller.h

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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/touch/touch_observer_hud.cc ('k') | ash/wm/app_list_controller.cc » ('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 #ifndef ASH_WM_APP_LIST_CONTROLLER_H_ 5 #ifndef ASH_WM_APP_LIST_CONTROLLER_H_
6 #define ASH_WM_APP_LIST_CONTROLLER_H_ 6 #define ASH_WM_APP_LIST_CONTROLLER_H_
7 7
8 #include "ash/launcher/launcher_icon_observer.h" 8 #include "ash/launcher/launcher_icon_observer.h"
9 #include "ash/shell_observer.h" 9 #include "ash/shell_observer.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 const ui::LocatedEvent& event); 74 const ui::LocatedEvent& event);
75 75
76 // Makes app list bubble update its bounds. 76 // Makes app list bubble update its bounds.
77 void UpdateBounds(); 77 void UpdateBounds();
78 78
79 // aura::EventFilter overrides: 79 // aura::EventFilter overrides:
80 virtual bool PreHandleKeyEvent(aura::Window* target, 80 virtual bool PreHandleKeyEvent(aura::Window* target,
81 ui::KeyEvent* event) OVERRIDE; 81 ui::KeyEvent* event) OVERRIDE;
82 virtual bool PreHandleMouseEvent(aura::Window* target, 82 virtual bool PreHandleMouseEvent(aura::Window* target,
83 ui::MouseEvent* event) OVERRIDE; 83 ui::MouseEvent* event) OVERRIDE;
84 virtual ui::TouchStatus PreHandleTouchEvent( 84 virtual ui::EventResult PreHandleTouchEvent(
85 aura::Window* target, 85 aura::Window* target,
86 ui::TouchEvent* event) OVERRIDE; 86 ui::TouchEvent* event) OVERRIDE;
87 virtual ui::EventResult PreHandleGestureEvent( 87 virtual ui::EventResult PreHandleGestureEvent(
88 aura::Window* target, 88 aura::Window* target,
89 ui::GestureEvent* event) OVERRIDE; 89 ui::GestureEvent* event) OVERRIDE;
90 90
91 // aura::FocusChangeObserver overrides: 91 // aura::FocusChangeObserver overrides:
92 virtual void OnWindowFocused(aura::Window* window) OVERRIDE; 92 virtual void OnWindowFocused(aura::Window* window) OVERRIDE;
93 93
94 // aura::RootWindowObserver overrides: 94 // aura::RootWindowObserver overrides:
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // Whether should schedule snap back animation. 126 // Whether should schedule snap back animation.
127 bool should_snap_back_; 127 bool should_snap_back_;
128 128
129 DISALLOW_COPY_AND_ASSIGN(AppListController); 129 DISALLOW_COPY_AND_ASSIGN(AppListController);
130 }; 130 };
131 131
132 } // namespace internal 132 } // namespace internal
133 } // namespace ash 133 } // namespace ash
134 134
135 #endif // ASH_WM_APP_LIST_CONTROLLER_H_ 135 #endif // ASH_WM_APP_LIST_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/touch/touch_observer_hud.cc ('k') | ash/wm/app_list_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698