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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_activation_client.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/view.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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE; 53 virtual bool CanActivateWindow(aura::Window* window) const OVERRIDE;
54 54
55 // Overridden from aura::WindowObserver: 55 // Overridden from aura::WindowObserver:
56 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 56 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
57 57
58 // Overridden from aura::client::FocusChangeObserver: 58 // Overridden from aura::client::FocusChangeObserver:
59 virtual void OnWindowFocused(aura::Window* gained_focus, 59 virtual void OnWindowFocused(aura::Window* gained_focus,
60 aura::Window* lost_focus) OVERRIDE; 60 aura::Window* lost_focus) OVERRIDE;
61 61
62 // Overridden from ui::EventHandler: 62 // Overridden from ui::EventHandler:
63 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 63 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
64 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 64 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
65 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 65 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
66 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 66 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
67 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 67 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
68 68
69 private: 69 private:
70 void FocusWindowWithEvent(const ui::Event* event); 70 void FocusWindowWithEvent(const ui::Event* event);
71 71
72 aura::RootWindow* root_window_; 72 aura::RootWindow* root_window_;
73 73
74 // The current active window. 74 // The current active window.
75 aura::Window* current_active_; 75 aura::Window* current_active_;
76 76
77 // True inside ActivateWindow(). Used to prevent recursion of focus 77 // True inside ActivateWindow(). Used to prevent recursion of focus
78 // change notifications causing activation. 78 // change notifications causing activation.
79 bool updating_activation_; 79 bool updating_activation_;
80 80
81 ObserverList<aura::client::ActivationChangeObserver> observers_; 81 ObserverList<aura::client::ActivationChangeObserver> observers_;
82 82
83 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_; 83 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
84 84
85 DISALLOW_COPY_AND_ASSIGN(DesktopActivationClient); 85 DISALLOW_COPY_AND_ASSIGN(DesktopActivationClient);
86 }; 86 };
87 87
88 } // namespace views 88 } // namespace views
89 89
90 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESTKOP_ACTIVATION_CLIENT_H_ 90 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESTKOP_ACTIVATION_CLIENT_H_
OLDNEW
« no previous file with comments | « ui/views/view.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