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

Side by Side Diff: ash/system/tray/tray_bubble_view.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/system/tray/tray_bubble_view.h ('k') | ash/tooltips/tooltip_controller.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/system/tray/tray_bubble_view.h" 5 #include "ash/system/tray/tray_bubble_view.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_window_ids.h" 8 #include "ash/shell_window_ids.h"
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "ash/wm/shelf_layout_manager.h" 10 #include "ash/wm/shelf_layout_manager.h"
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 462
463 bool TrayBubbleView::Host::PreHandleMouseEvent(aura::Window* target, 463 bool TrayBubbleView::Host::PreHandleMouseEvent(aura::Window* target,
464 ui::MouseEvent* event) { 464 ui::MouseEvent* event) {
465 if (event->type() == ui::ET_MOUSE_PRESSED) 465 if (event->type() == ui::ET_MOUSE_PRESSED)
466 ProcessLocatedEvent(*event); 466 ProcessLocatedEvent(*event);
467 return false; 467 return false;
468 } 468 }
469 469
470 ui::TouchStatus TrayBubbleView::Host::PreHandleTouchEvent( 470 ui::TouchStatus TrayBubbleView::Host::PreHandleTouchEvent(
471 aura::Window* target, 471 aura::Window* target,
472 ui::TouchEventImpl* event) { 472 ui::TouchEvent* event) {
473 if (event->type() == ui::ET_TOUCH_PRESSED) 473 if (event->type() == ui::ET_TOUCH_PRESSED)
474 ProcessLocatedEvent(*event); 474 ProcessLocatedEvent(*event);
475 return ui::TOUCH_STATUS_UNKNOWN; 475 return ui::TOUCH_STATUS_UNKNOWN;
476 } 476 }
477 477
478 ui::GestureStatus TrayBubbleView::Host::PreHandleGestureEvent( 478 ui::GestureStatus TrayBubbleView::Host::PreHandleGestureEvent(
479 aura::Window* target, 479 aura::Window* target,
480 ui::GestureEventImpl* event) { 480 ui::GestureEventImpl* event) {
481 return ui::GESTURE_STATUS_UNKNOWN; 481 return ui::GESTURE_STATUS_UNKNOWN;
482 } 482 }
(...skipping 13 matching lines...) Expand all
496 return; 496 return;
497 } 497 }
498 // Handle clicking outside the bubble and tray. We don't block the event, so 498 // Handle clicking outside the bubble and tray. We don't block the event, so
499 // it will also be handled by whatever widget was clicked on. 499 // it will also be handled by whatever widget was clicked on.
500 OnClickedOutsideView(); 500 OnClickedOutsideView();
501 } 501 }
502 502
503 503
504 } // namespace internal 504 } // namespace internal
505 } // namespace ash 505 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_bubble_view.h ('k') | ash/tooltips/tooltip_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698