Fixing activation problem: Pages which refresh themselves should not get focus

chrome/browser/ui/browser.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.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 2679 matching lines @@
     GetStatusBubble()->Hide();
 
   // Update the location bar. This is synchronous. We specifically don't
   // update the load state since the load hasn't started yet and updating it
   // will put it out of sync with the actual state like whether we're
   // displaying a favicon, which controls the throbber. If we updated it here,
   // the throbber will show the default favicon for a split second when
   // navigating away from the new tab page.
   ScheduleUIUpdate(contents->web_contents(), content::INVALIDATE_TYPE_URL);
 
-  if (contents_is_selected)
+  // Focus on the content if the window and tab are active and the call was
+  // triggered by an automated page refresh.
+  if (user_initiated && contents_is_selected && window()->IsActive())

[sky, 2012/05/21 20:42:52]

Shouldn' this be an or, eg:

if (content_is_selected && (user_initiated || window->IsActive()) ?

[Mr4D (OOO till 08-26), 2012/05/21 21:27:12]

Done. (Wow good catch - somehow didn't think straight when applying your
previous request).

     contents->web_contents()->Focus();
 }
 
 void Browser::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) {
   browser::ShowCollectedCookiesDialog(window()->GetNativeHandle(), wrapper);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, PageNavigator implementation:
 
@@ skipping 691 matching lines @@
 // Browser, content::WebContentsDelegate implementation:
 
 WebContents* Browser::OpenURLFromTab(WebContents* source,
                                      const OpenURLParams& params) {
   browser::NavigateParams nav_params(this, params.url, params.transition);
   nav_params.source_contents = GetTabContentsWrapperAt(
       tab_strip_model_->GetWrapperIndex(source));
   nav_params.referrer = params.referrer;
   nav_params.disposition = params.disposition;
   nav_params.tabstrip_add_types = TabStripModel::ADD_NONE;
-  nav_params.window_action = browser::NavigateParams::SHOW_WINDOW;
+
+  // Show the tab if either the tab and window are already active, or this
+  // was not triggered by an update tab function (through e.g. an automated
+  // update).
+  if (params.disposition != CURRENT_TAB ||
+      (GetSelectedWebContents() == source && window()->IsActive()))
+    nav_params.window_action = browser::NavigateParams::SHOW_WINDOW;
+
   nav_params.user_gesture = true;
   nav_params.override_encoding = params.override_encoding;
   nav_params.is_renderer_initiated = params.is_renderer_initiated;
   nav_params.transferred_global_request_id =
       params.transferred_global_request_id;
   browser::Navigate(&nav_params);
 
   return nav_params.target_contents ?
       nav_params.target_contents->web_contents() : NULL;
 }
@@ skipping 2002 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }