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

Side by Side Diff: ui/views/corewm/focus_controller.h

Issue 11519040: More unittests passing with new focus controller. (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/corewm/base_focus_rules.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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 void WindowLostFocusFromDispositionChange(aura::Window* window); 99 void WindowLostFocusFromDispositionChange(aura::Window* window);
100 100
101 // Called when an attempt is made to focus or activate a window via an input 101 // Called when an attempt is made to focus or activate a window via an input
102 // event targeted at that window. Rules determine the best focusable window 102 // event targeted at that window. Rules determine the best focusable window
103 // for the input window. 103 // for the input window.
104 void WindowFocusedFromInputEvent(aura::Window* window); 104 void WindowFocusedFromInputEvent(aura::Window* window);
105 105
106 aura::Window* active_window_; 106 aura::Window* active_window_;
107 aura::Window* focused_window_; 107 aura::Window* focused_window_;
108 108
109 bool updating_focus_;
110
109 scoped_ptr<FocusRules> rules_; 111 scoped_ptr<FocusRules> rules_;
110 112
111 ObserverList<aura::client::ActivationChangeObserver> activation_observers_; 113 ObserverList<aura::client::ActivationChangeObserver> activation_observers_;
112 ObserverList<aura::client::FocusChangeObserver> focus_observers_; 114 ObserverList<aura::client::FocusChangeObserver> focus_observers_;
113 115
114 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_; 116 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_;
115 117
116 DISALLOW_COPY_AND_ASSIGN(FocusController); 118 DISALLOW_COPY_AND_ASSIGN(FocusController);
117 }; 119 };
118 120
119 } // namespace corewm 121 } // namespace corewm
120 } // namespace views 122 } // namespace views
121 123
122 #endif // UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_ 124 #endif // UI_VIEWS_COREWM_FOCUS_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/views/corewm/base_focus_rules.cc ('k') | ui/views/corewm/focus_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698