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

Side by Side Diff: ui/views/widget/native_widget_aura.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 UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "ui/aura/client/activation_change_observer.h" 10 #include "ui/aura/client/activation_change_observer.h"
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 154 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
155 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 155 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
156 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 156 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
157 157
158 // Overridden from aura::client::ActivationDelegate: 158 // Overridden from aura::client::ActivationDelegate:
159 virtual bool ShouldActivate() const OVERRIDE; 159 virtual bool ShouldActivate() const OVERRIDE;
160 160
161 // Overridden from aura::client::ActivationChangeObserver: 161 // Overridden from aura::client::ActivationChangeObserver:
162 virtual void OnWindowActivated(aura::Window* gained_active, 162 virtual void OnWindowActivated(aura::Window* gained_active,
163 aura::Window* lost_active) OVERRIDE; 163 aura::Window* lost_active) OVERRIDE;
164 virtual void OnWindowActivationRequestCompleted(
165 aura::Window* request_active, aura::Window* actual_active) OVERRIDE;
164 166
165 // Overridden from aura::client::FocusChangeObserver: 167 // Overridden from aura::client::FocusChangeObserver:
166 virtual void OnWindowFocused(aura::Window* gained_focus, 168 virtual void OnWindowFocused(aura::Window* gained_focus,
167 aura::Window* lost_focus) OVERRIDE; 169 aura::Window* lost_focus) OVERRIDE;
168 170
169 // Overridden from aura::client::DragDropDelegate: 171 // Overridden from aura::client::DragDropDelegate:
170 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 172 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
171 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE; 173 virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
172 virtual void OnDragExited() OVERRIDE; 174 virtual void OnDragExited() OVERRIDE;
173 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE; 175 virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 212
211 scoped_ptr<DropHelper> drop_helper_; 213 scoped_ptr<DropHelper> drop_helper_;
212 int last_drop_operation_; 214 int last_drop_operation_;
213 215
214 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura); 216 DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
215 }; 217 };
216 218
217 } // namespace views 219 } // namespace views
218 220
219 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_ 221 #endif // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698