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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_activation_client.h

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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/view_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.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_WIDGET_DESKTOP_AURA_DESTKOP_ACTIVATION_CLIENT_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESTKOP_ACTIVATION_CLIENT_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESTKOP_ACTIVATION_CLIENT_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESTKOP_ACTIVATION_CLIENT_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "base/scoped_observer.h" 10 #include "base/scoped_observer.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 55 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
56 56
57 // Overridden from aura::client::FocusChangeObserver: 57 // Overridden from aura::client::FocusChangeObserver:
58 virtual void OnWindowFocused(aura::Window* window) OVERRIDE; 58 virtual void OnWindowFocused(aura::Window* window) OVERRIDE;
59 59
60 // Overridden from ui::EventHandler: 60 // Overridden from ui::EventHandler:
61 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 61 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
62 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 62 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
63 virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 63 virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
64 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 64 virtual ui::EventResult OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
65 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 65 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
66 66
67 private: 67 private:
68 void FocusWindowWithEvent(const ui::Event* event); 68 void FocusWindowWithEvent(const ui::Event* event);
69 69
70 aura::RootWindow* root_window_; 70 aura::RootWindow* root_window_;
71 71
72 // The current active window. 72 // The current active window.
73 aura::Window* current_active_; 73 aura::Window* current_active_;
74 74
75 // True inside ActivateWindow(). Used to prevent recursion of focus 75 // True inside ActivateWindow(). Used to prevent recursion of focus
76 // change notifications causing activation. 76 // change notifications causing activation.
77 bool updating_activation_; 77 bool updating_activation_;
78 78
79 ObserverList<aura::client::ActivationChangeObserver> observers_; 79 ObserverList<aura::client::ActivationChangeObserver> observers_;
80 80
81 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_; 81 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
82 82
83 DISALLOW_COPY_AND_ASSIGN(DesktopActivationClient); 83 DISALLOW_COPY_AND_ASSIGN(DesktopActivationClient);
84 }; 84 };
85 85
86 } // namespace views 86 } // namespace views
87 87
88 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESTKOP_ACTIVATION_CLIENT_H_ 88 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESTKOP_ACTIVATION_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/views/view_unittest.cc ('k') | ui/views/widget/desktop_aura/desktop_activation_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698