Allows focus to change when capture held

ui/views/corewm/focus_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/focus_controller.h"
 
 #include "base/auto_reset.h"
 #include "ui/aura/client/activation_change_observer.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/capture_client.h"
@@ skipping 112 matching lines @@
     aura::client::FocusChangeObserver* observer) {
   focus_observers_.RemoveObserver(observer);
 }
 
 void FocusController::FocusWindow(aura::Window* window) {
   if (window &&
       (window->Contains(focused_window_) || window->Contains(active_window_))) {
     return;
   }
 
-  // We should not be messing with the focus if the window has capture.
-  if (window && (aura::client::GetCaptureWindow(window) == window))
+  // We should not be messing with the focus if the window has capture, unless
+  // no has focus.
+  if (window && (aura::client::GetCaptureWindow(window) == window) &&
+      focused_window_) {
     return;
+  }
 
   // Focusing a window also activates its containing activatable window. Note
   // that the rules could redirect activation activation and/or focus.
   aura::Window* focusable = rules_->GetFocusableWindow(window);
   aura::Window* activatable =
       focusable ? rules_->GetActivatableWindow(focusable) : NULL;
 
   // We need valid focusable/activatable windows in the event we're not clearing
   // focus. "Clearing focus" is inferred by whether or not |window| passed to
   // this function is non-NULL.
@@ skipping 203 matching lines @@
 void FocusController::WindowFocusedFromInputEvent(aura::Window* window) {
   // Only focus |window| if it or any of its parents can be focused. Otherwise
   // FocusWindow() will focus the topmost window, which may not be the
   // currently focused one.
   if (rules_->CanFocusWindow(GetToplevelWindow(window)))
     FocusWindow(window);
 }
 
 }  // namespace corewm
 }  // namespace views