aura: Fix focus on web contents for popup windows

chrome/browser/ui/views/frame/browser_frame_aura.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 "chrome/browser/ui/views/frame/browser_frame_aura.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"
 #include "grit/chromium_strings.h"
@@ skipping 120 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, views::NativeWidgetAura overrides:
 
 void BrowserFrameAura::OnWindowDestroying() {
   // Window is destroyed before our destructor is called, so clean up our
   // observer here.
   GetNativeWindow()->RemoveObserver(window_property_watcher_.get());
   views::NativeWidgetAura::OnWindowDestroying();
 }
 
+void BrowserFrameAura::OnWindowTargetVisibilityChanged(bool visible) {
+  // On Aura when the BrowserView is shown it tries to restore focus, but can
+  // be blocked when this parent BrowserFrameAura isn't visible. Therefore we
+  // RestoreFocus() when we become visible, which results in the web contents
+  // being asked to focus, which places focus either in the web contents or in
+  // the location bar as appropriate.
+  if (visible)
+    browser_view_->RestoreFocus();
+  views::NativeWidgetAura::OnWindowTargetVisibilityChanged(visible);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, NativeBrowserFrame implementation:
 
 views::NativeWidget* BrowserFrameAura::AsNativeWidget() {
   return this;
 }
 
 const views::NativeWidget* BrowserFrameAura::AsNativeWidget() const {
   return this;
 }
@@ skipping 29 matching lines @@
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameAura(browser_frame, browser_view);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, private:
 
 BrowserFrameAura::~BrowserFrameAura() {
 }