diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-13 13:24:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-10-14 10:57:25 +0000 |
| commit | af3d4809763ef308f08ced947a73b624729ac7ea (patch) | |
| tree | 4402b911e30383f6c6dace1e8cf3b8e85355db3a /chromium/ui/wm/core/focus_controller.cc | |
| parent | 0e8ff63a407fe323e215bb1a2c423c09a4747c8a (diff) | |
| download | qtwebengine-chromium-af3d4809763ef308f08ced947a73b624729ac7ea.tar.gz | |
BASELINE: Update Chromium to 47.0.2526.14
Also adding in sources needed for spellchecking.
Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'chromium/ui/wm/core/focus_controller.cc')
| -rw-r--r-- | chromium/ui/wm/core/focus_controller.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chromium/ui/wm/core/focus_controller.cc b/chromium/ui/wm/core/focus_controller.cc index d062903216a..e1b644dccc7 100644 --- a/chromium/ui/wm/core/focus_controller.cc +++ b/chromium/ui/wm/core/focus_controller.cc @@ -188,6 +188,7 @@ void FocusController::FocusAndActivateWindow( aura::Window* window) { if (window && (window->Contains(focused_window_) || window->Contains(active_window_))) { + StackActiveWindow(); return; } @@ -298,10 +299,8 @@ void FocusController::SetActiveWindow( active_window_ = window; if (active_window_ && !observer_manager_.IsObserving(active_window_)) observer_manager_.Add(active_window_); - if (active_window_) { - StackTransientParentsBelowModalWindow(active_window_); - active_window_->parent()->StackChildAtTop(active_window_); - } + if (active_window_) + StackActiveWindow(); aura::client::ActivationChangeObserver* observer = NULL; if (window_tracker.Contains(lost_activation)) { @@ -322,6 +321,13 @@ void FocusController::SetActiveWindow( window_tracker.Contains(lost_activation) ? lost_activation : NULL)); } +void FocusController::StackActiveWindow() { + if (active_window_) { + StackTransientParentsBelowModalWindow(active_window_); + active_window_->parent()->StackChildAtTop(active_window_); + } +} + void FocusController::WindowLostFocusFromDispositionChange( aura::Window* window, aura::Window* next) { |