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

Unified Diff: ui/views/corewm/focus_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: focus controller unittest 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 side-by-side diff with in-line comments
Download patch
Index: ui/views/corewm/focus_controller.h
diff --git a/ui/views/corewm/focus_controller.h b/ui/views/corewm/focus_controller.h
index 4912a64cb506aba528e84f3ba376791df364f65e..d8fa3f739d404aeac681ffa28ef2efd06212a05f 100644
--- a/ui/views/corewm/focus_controller.h
+++ b/ui/views/corewm/focus_controller.h
@@ -88,7 +88,12 @@ class VIEWS_EXPORT FocusController : public aura::client::ActivationClient,
// etc. These functions must be called with valid focusable/activatable
// windows.
void SetFocusedWindow(aura::Window* window);
- void SetActiveWindow(aura::Window* window);
+ // |requested window| refers to the window that was passed in to an external
+ // request (e.g. FocusWindow or ActivateWindow). It may be NULL, e.g. if
+ // SetActiveWindow was not called by an external request. |active_window|
+ // refers to the actual window to be activated, which may be different.
+ void SetActiveWindow(aura::Window* requested_window,
+ aura::Window* active_window);
// Called when a window's disposition changed such that it and its hierarchy
// are no longer focusable/activatable. |next| is a valid window that is used

Powered by Google App Engine
This is Rietveld 408576698