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

Side by Side Diff: ash/tooltips/tooltip_controller.h

Issue 11570012: events: Update key-event handlers to not return EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-for-landing Created 8 years 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/launcher/launcher_tooltip_manager_unittest.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 "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/wm/session_state_observer.h" 9 #include "ash/wm/session_state_observer.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 26 matching lines...) Expand all
37 public SessionStateObserver { 37 public SessionStateObserver {
38 public: 38 public:
39 explicit TooltipController(aura::client::DragDropClient* drag_drop_client); 39 explicit TooltipController(aura::client::DragDropClient* drag_drop_client);
40 virtual ~TooltipController(); 40 virtual ~TooltipController();
41 41
42 // Overridden from aura::client::TooltipClient. 42 // Overridden from aura::client::TooltipClient.
43 virtual void UpdateTooltip(aura::Window* target) OVERRIDE; 43 virtual void UpdateTooltip(aura::Window* target) OVERRIDE;
44 virtual void SetTooltipsEnabled(bool enable) OVERRIDE; 44 virtual void SetTooltipsEnabled(bool enable) OVERRIDE;
45 45
46 // Overridden from ui::EventHandler. 46 // Overridden from ui::EventHandler.
47 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 47 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
48 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 48 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
49 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 49 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
50 50
51 // Overridden from SessionStateController. 51 // Overridden from SessionStateController.
52 virtual void OnSessionStateEvent(SessionStateObserver::EventType event) 52 virtual void OnSessionStateEvent(SessionStateObserver::EventType event)
53 OVERRIDE; 53 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
(...skipping 52 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/launcher/launcher_tooltip_manager_unittest.cc ('k') | ash/tooltips/tooltip_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698