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

Side by Side Diff: ui/views/corewm/focus_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 | « ui/views/corewm/compound_event_filter.cc ('k') | ui/views/corewm/focus_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 UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ 5 #ifndef UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
6 #define UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ 6 #define UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/scoped_observer.h" 9 #include "base/scoped_observer.h"
10 #include "ui/aura/client/activation_client.h" 10 #include "ui/aura/client/activation_client.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 virtual void RemoveObserver( 64 virtual void RemoveObserver(
65 aura::client::FocusChangeObserver* observer) OVERRIDE; 65 aura::client::FocusChangeObserver* observer) OVERRIDE;
66 virtual void FocusWindow(aura::Window* window, 66 virtual void FocusWindow(aura::Window* window,
67 const ui::Event* event) OVERRIDE; 67 const ui::Event* event) OVERRIDE;
68 virtual aura::Window* GetFocusedWindow() OVERRIDE; 68 virtual aura::Window* GetFocusedWindow() OVERRIDE;
69 virtual void OnWindowHiddenInRootWindow(aura::Window* window, 69 virtual void OnWindowHiddenInRootWindow(aura::Window* window,
70 aura::RootWindow* root_window, 70 aura::RootWindow* root_window,
71 bool destroyed) OVERRIDE; 71 bool destroyed) OVERRIDE;
72 72
73 // Overridden from ui::EventHandler: 73 // Overridden from ui::EventHandler:
74 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 74 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
75 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 75 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
76 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 76 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
77 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 77 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
78 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 78 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
79 79
80 // Overridden from aura::WindowObserver: 80 // Overridden from aura::WindowObserver:
81 virtual void OnWindowVisibilityChanged(aura::Window* window, 81 virtual void OnWindowVisibilityChanged(aura::Window* window,
82 bool visible) OVERRIDE; 82 bool visible) OVERRIDE;
83 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 83 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
84 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE; 84 virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
(...skipping 30 matching lines...) Expand all
115 115
116 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_; 116 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
117 117
118 DISALLOW_COPY_AND_ASSIGN(FocusController); 118 DISALLOW_COPY_AND_ASSIGN(FocusController);
119 }; 119 };
120 120
121 } // namespace corewm 121 } // namespace corewm
122 } // namespace views 122 } // namespace views
123 123
124 #endif // UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ 124 #endif // UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/views/corewm/compound_event_filter.cc ('k') | ui/views/corewm/focus_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698