| 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
|
|
|