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

Side by Side Diff: ash/wm/window_cycle_controller.h

Issue 14222019: Trying to activate a window in a workspace other than the current is ignored while a system modal d… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 8 months 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
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_WM_WINDOW_CYCLE_CONTROLLER_H_ 5 #ifndef ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
6 #define ASH_WM_WINDOW_CYCLE_CONTROLLER_H_ 6 #define ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 100
101 // Stops the current window cycle and cleans up the event filter. 101 // Stops the current window cycle and cleans up the event filter.
102 void StopCycling(); 102 void StopCycling();
103 103
104 // Checks if the window represents a container whose children we track. 104 // Checks if the window represents a container whose children we track.
105 static bool IsTrackedContainer(aura::Window* window); 105 static bool IsTrackedContainer(aura::Window* window);
106 106
107 // Overridden from aura::client::ActivationChangeObserver: 107 // Overridden from aura::client::ActivationChangeObserver:
108 virtual void OnWindowActivated(aura::Window* gained_active, 108 virtual void OnWindowActivated(aura::Window* gained_active,
109 aura::Window* lost_active) OVERRIDE; 109 aura::Window* lost_active) OVERRIDE;
110 virtual void OnWindowActivationRequestCompleted(
111 aura::Window* request_active, aura::Window* actual_active) OVERRIDE;
110 112
111 // Overridden from WindowObserver: 113 // Overridden from WindowObserver:
112 virtual void OnWindowAdded(aura::Window* window) OVERRIDE; 114 virtual void OnWindowAdded(aura::Window* window) OVERRIDE;
113 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE; 115 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE;
114 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE; 116 virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
115 117
116 scoped_ptr<WindowCycleList> windows_; 118 scoped_ptr<WindowCycleList> windows_;
117 119
118 // Event handler to watch for release of alt key. 120 // Event handler to watch for release of alt key.
119 scoped_ptr<ui::EventHandler> event_handler_; 121 scoped_ptr<ui::EventHandler> event_handler_;
120 122
121 // List of windows that have been activated in containers that we cycle 123 // List of windows that have been activated in containers that we cycle
122 // through, sorted by most recently used. 124 // through, sorted by most recently used.
123 std::list<aura::Window*> mru_windows_; 125 std::list<aura::Window*> mru_windows_;
124 126
125 aura::client::ActivationClient* activation_client_; 127 aura::client::ActivationClient* activation_client_;
126 128
127 DISALLOW_COPY_AND_ASSIGN(WindowCycleController); 129 DISALLOW_COPY_AND_ASSIGN(WindowCycleController);
128 }; 130 };
129 131
130 } // namespace ash 132 } // namespace ash
131 133
132 #endif // ASH_WM_WINDOW_CYCLE_CONTROLLER_H_ 134 #endif // ASH_WM_WINDOW_CYCLE_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698