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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_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_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include "base/memory/weak_ptr.h" 8 #include "base/memory/weak_ptr.h"
9 #include "ui/aura/client/activation_change_observer.h" 9 #include "ui/aura/client/activation_change_observer.h"
10 #include "ui/aura/client/activation_delegate.h" 10 #include "ui/aura/client/activation_delegate.h"
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE; 173 virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
174 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 174 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
175 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 175 virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
176 176
177 // Overridden from aura::client::ActivationDelegate: 177 // Overridden from aura::client::ActivationDelegate:
178 virtual bool ShouldActivate() const OVERRIDE; 178 virtual bool ShouldActivate() const OVERRIDE;
179 179
180 // Overridden from aura::client::ActivationChangeObserver: 180 // Overridden from aura::client::ActivationChangeObserver:
181 virtual void OnWindowActivated(aura::Window* gained_active, 181 virtual void OnWindowActivated(aura::Window* gained_active,
182 aura::Window* lost_active) OVERRIDE; 182 aura::Window* lost_active) OVERRIDE;
183 virtual void OnWindowActivationRequestCompleted(
184 aura::Window* request_active, aura::Window* actual_active) OVERRIDE;
183 185
184 // Overridden from aura::client::FocusChangeObserver: 186 // Overridden from aura::client::FocusChangeObserver:
185 virtual void OnWindowFocused(aura::Window* gained_focus, 187 virtual void OnWindowFocused(aura::Window* gained_focus,
186 aura::Window* lost_focus) OVERRIDE; 188 aura::Window* lost_focus) OVERRIDE;
187 189
188 // Overridden from views::internal::InputMethodDelegate: 190 // Overridden from views::internal::InputMethodDelegate:
189 virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE; 191 virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE;
190 192
191 // Overridden from aura::client::DragDropDelegate: 193 // Overridden from aura::client::DragDropDelegate:
192 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE; 194 virtual void OnDragEntered(const ui::DropTargetEvent& event) OVERRIDE;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 bool restore_focus_on_activate_; 240 bool restore_focus_on_activate_;
239 241
240 scoped_ptr<corewm::ShadowController> shadow_controller_; 242 scoped_ptr<corewm::ShadowController> shadow_controller_;
241 243
242 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 244 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
243 }; 245 };
244 246
245 } // namespace views 247 } // namespace views
246 248
247 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ 249 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698