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

Side by Side Diff: ash/tooltips/tooltip_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/system/tray/tray_event_filter.cc ('k') | ash/tooltips/tooltip_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_TOOLTIPS_TOOLTIP_CONTROLLER_H_ 5 #ifndef ASH_TOOLTIPS_TOOLTIP_CONTROLLER_H_
6 #define ASH_TOOLTIPS_TOOLTIP_CONTROLLER_H_ 6 #define ASH_TOOLTIPS_TOOLTIP_CONTROLLER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/timer.h" 10 #include "base/timer.h"
(...skipping 28 matching lines...) Expand all
39 39
40 // Overridden from aura::client::TooltipClient. 40 // Overridden from aura::client::TooltipClient.
41 virtual void UpdateTooltip(aura::Window* target) OVERRIDE; 41 virtual void UpdateTooltip(aura::Window* target) OVERRIDE;
42 virtual void SetTooltipsEnabled(bool enable) OVERRIDE; 42 virtual void SetTooltipsEnabled(bool enable) OVERRIDE;
43 43
44 // Overridden from aura::EventFilter. 44 // Overridden from aura::EventFilter.
45 virtual bool PreHandleKeyEvent(aura::Window* target, 45 virtual bool PreHandleKeyEvent(aura::Window* target,
46 ui::KeyEvent* event) OVERRIDE; 46 ui::KeyEvent* event) OVERRIDE;
47 virtual bool PreHandleMouseEvent(aura::Window* target, 47 virtual bool PreHandleMouseEvent(aura::Window* target,
48 ui::MouseEvent* event) OVERRIDE; 48 ui::MouseEvent* event) OVERRIDE;
49 virtual ui::TouchStatus PreHandleTouchEvent( 49 virtual ui::EventResult PreHandleTouchEvent(
50 aura::Window* target, 50 aura::Window* target,
51 ui::TouchEvent* event) OVERRIDE; 51 ui::TouchEvent* event) OVERRIDE;
52 virtual ui::EventResult PreHandleGestureEvent(aura::Window* target, 52 virtual ui::EventResult PreHandleGestureEvent(aura::Window* target,
53 ui::GestureEvent* event) OVERRIDE; 53 ui::GestureEvent* event) OVERRIDE;
54 54
55 // Overridden from aura::WindowObserver. 55 // Overridden from aura::WindowObserver.
56 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 56 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
57 57
58 gfx::Point mouse_location() const { return curr_mouse_loc_; } 58 gfx::Point mouse_location() const { return curr_mouse_loc_; }
59 59
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 110
111 bool tooltips_enabled_; 111 bool tooltips_enabled_;
112 112
113 DISALLOW_COPY_AND_ASSIGN(TooltipController); 113 DISALLOW_COPY_AND_ASSIGN(TooltipController);
114 }; 114 };
115 115
116 } // namespace internal 116 } // namespace internal
117 } // namespace ash 117 } // namespace ash
118 118
119 #endif // ASH_TOOLTIPS_TOOLTIP_CONTROLLER_H_ 119 #endif // ASH_TOOLTIPS_TOOLTIP_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_event_filter.cc ('k') | ash/tooltips/tooltip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698