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

Side by Side Diff: ash/wm/app_list_controller.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/app_list_controller.h ('k') | ash/wm/event_rewriter_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/app_list_controller.h" 5 #include "ash/wm/app_list_controller.h"
6 6
7 #include "ash/launcher/launcher.h" 7 #include "ash/launcher/launcher.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_delegate.h" 10 #include "ash/shell_delegate.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 bool AppListController::PreHandleMouseEvent(aura::Window* target, 241 bool AppListController::PreHandleMouseEvent(aura::Window* target,
242 ui::MouseEvent* event) { 242 ui::MouseEvent* event) {
243 if (event->type() == ui::ET_MOUSE_PRESSED) 243 if (event->type() == ui::ET_MOUSE_PRESSED)
244 ProcessLocatedEvent(target, *event); 244 ProcessLocatedEvent(target, *event);
245 return false; 245 return false;
246 } 246 }
247 247
248 ui::TouchStatus AppListController::PreHandleTouchEvent( 248 ui::TouchStatus AppListController::PreHandleTouchEvent(
249 aura::Window* target, 249 aura::Window* target,
250 ui::TouchEventImpl* event) { 250 ui::TouchEvent* event) {
251 return ui::TOUCH_STATUS_UNKNOWN; 251 return ui::TOUCH_STATUS_UNKNOWN;
252 } 252 }
253 253
254 ui::GestureStatus AppListController::PreHandleGestureEvent( 254 ui::GestureStatus AppListController::PreHandleGestureEvent(
255 aura::Window* target, 255 aura::Window* target,
256 ui::GestureEventImpl* event) { 256 ui::GestureEventImpl* event) {
257 if (event->type() == ui::ET_GESTURE_TAP) 257 if (event->type() == ui::ET_GESTURE_TAP)
258 ProcessLocatedEvent(target, *event); 258 ProcessLocatedEvent(target, *event);
259 return ui::GESTURE_STATUS_UNKNOWN; 259 return ui::GESTURE_STATUS_UNKNOWN;
260 } 260 }
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 307
308 //////////////////////////////////////////////////////////////////////////////// 308 ////////////////////////////////////////////////////////////////////////////////
309 // AppListController, LauncherIconObserver implementation: 309 // AppListController, LauncherIconObserver implementation:
310 310
311 void AppListController::OnLauncherIconPositionsChanged() { 311 void AppListController::OnLauncherIconPositionsChanged() {
312 UpdateBounds(); 312 UpdateBounds();
313 } 313 }
314 314
315 } // namespace internal 315 } // namespace internal
316 } // namespace ash 316 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/app_list_controller.h ('k') | ash/wm/event_rewriter_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698