Focus the contents of popup windows

chrome/browser/ui/browser_navigator.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/browser_navigator.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
@@ skipping 274 matching lines @@
 }
 
 // This class makes sure the Browser object held in |params| is made visible
 // by the time it goes out of scope, provided |params| wants it to be shown.
 class ScopedBrowserShower {
  public:
   explicit ScopedBrowserShower(chrome::NavigateParams* params)
       : params_(params) {
   }
   ~ScopedBrowserShower() {
-    if (params_->window_action == chrome::NavigateParams::SHOW_WINDOW_INACTIVE)
+    if (params_->window_action ==
+        chrome::NavigateParams::SHOW_WINDOW_INACTIVE) {
       params_->browser->window()->ShowInactive();
-    else if (params_->window_action == chrome::NavigateParams::SHOW_WINDOW)
+    } else if (params_->window_action == chrome::NavigateParams::SHOW_WINDOW) {
       params_->browser->window()->Show();
+      // If a user gesture opened a popup window, focus the contents.
+      if (params_->user_gesture && params_->disposition == NEW_POPUP &&
+          params_->target_contents) {
+        params_->target_contents->Focus();
+      }
+    }
   }
+
  private:
   chrome::NavigateParams* params_;
   DISALLOW_COPY_AND_ASSIGN(ScopedBrowserShower);
 };
 
 // This class manages the lifetime of a WebContents created by the
 // Navigate() function. When Navigate() creates a WebContents for a URL,
 // an instance of this class takes ownership of it via TakeOwnership() until the
 // WebContents is added to a tab strip at which time ownership is
 // relinquished via ReleaseOwnership(). If this object goes out of scope without
@@ skipping 447 matching lines @@
   bool reverse_on_redirect = false;
   content::BrowserURLHandler::GetInstance()->RewriteURLIfNecessary(
       &rewritten_url, browser_context, &reverse_on_redirect);
 
   // Some URLs are mapped to uber subpages. Do not allow them in incognito.
   return !(rewritten_url.scheme() == content::kChromeUIScheme &&
            rewritten_url.host() == chrome::kChromeUIUberHost);
 }
 
 }  // namespace chrome