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 165 matching lines @@
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/renderer_preferences.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/net_util.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/url_request/url_request_context.h"
+#include "ui/aura/window.h"

[sky, 2012/05/21 16:42:50]

You shouldn't need this.

[Mr4D (OOO till 08-26), 2012/05/21 17:15:43]

Done.

 #include "ui/base/animation/animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/point.h"
 #include "webkit/glue/web_intent_data.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/window_open_disposition.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
@@ skipping 2493 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);
 
+  // In case of multiple windows we do not want to switch windows when this is
+  // not user initiated (e.g. automatic page refresh) and the current window
+  // is not the window we are targeting.
+  if (!user_initiated &&

[sky, 2012/05/21 16:42:50]

Combine this with the Focus() request since that's what it is intended for.
Also, I think you want:

if (contents_is_selected && user_initiated && window()->IsActive())
  ...->Focus()

[Mr4D (OOO till 08-26), 2012/05/21 17:15:43]

Done.

+      (GetSelectedWebContents() != contents->web_contents() ||
+       !window()->GetNativeHandle()->HasFocus()))
+    return;
+
   if (contents_is_selected)
     contents->web_contents()->Focus();
 }
 
 void Browser::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) {
   browser::ShowCollectedCookiesDialog(window()->GetNativeHandle(), wrapper);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, PageNavigator implementation:
@@ skipping 692 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;
+#if defined(USE_ASH)

[sky, 2012/05/21 16:42:50]

Again, I think you want this every where.

[Mr4D (OOO till 08-26), 2012/05/21 17:15:43]

Done.

+  // If the current tab is initiating this, we don't want to update.
+  if (nav_params.window_action != browser::NavigateParams::NO_ACTION ||
+      params.disposition != CURRENT_TAB ||
+      (GetSelectedTabContentsWrapper() == nav_params.source_contents &&

[sky, 2012/05/21 16:42:50]

Can you use source instead of nav_aprams.source_contents ?

[Mr4D (OOO till 08-26), 2012/05/21 17:15:43]

Done.

+       window()->GetNativeHandle()->HasFocus()))

[sky, 2012/05/21 16:42:50]

window()->IsActive()

[Mr4D (OOO till 08-26), 2012/05/21 17:15:43]

Done.

+#endif
+    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 2001 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;
 }