When focusing a tab via the extension API, bring focus to its containing window

chrome/browser/extensions/api/tabs/tabs_api.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/extensions/api/tabs/tabs_api.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 1080 matching lines @@
   // If index is specified, honor the value, but keep it bound to
   // -1 <= index <= tab_strip->count() where -1 invokes the default behavior.
   int index = -1;
   if (args->HasKey(keys::kIndexKey))
     EXTENSION_FUNCTION_VALIDATE(args->GetInteger(keys::kIndexKey, &index));
 
   TabStripModel* tab_strip = browser->tab_strip_model();
 
   index = std::min(std::max(index, -1), tab_strip->count());
 
-  int add_types = active ? TabStripModel::ADD_ACTIVE :
-                             TabStripModel::ADD_NONE;
+  int add_types = active ? TabStripModel::ADD_ACTIVE : TabStripModel::ADD_NONE;
   add_types |= TabStripModel::ADD_FORCE_INDEX;
   if (pinned)
     add_types |= TabStripModel::ADD_PINNED;
   chrome::NavigateParams params(browser, url, content::PAGE_TRANSITION_LINK);
   params.disposition = active ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
   params.tabstrip_index = index;
   params.tabstrip_add_types = add_types;
   chrome::Navigate(&params);
 
   // The tab may have been created in a different window, so make sure we look
   // at the right tab strip.
   tab_strip = params.browser->tab_strip_model();
   int new_index = tab_strip->GetIndexOfWebContents(params.target_contents);
   if (opener)
     tab_strip->SetOpenerOfWebContentsAt(new_index, opener);
 
-  if (active)
+  if (active) {
     params.target_contents->GetView()->SetInitialFocus();
+    params.target_contents->GetDelegate()->ActivateContents(
+        params.target_contents);

[not at google - send to devlin, 2013/02/13 01:28:11]

here and below if you activate it does it automatically give focus? seems like
it might.

[Matt Perry, 2013/02/13 01:38:52]

Good call, it does. I've removed the extraneous calls to Focus.

+  }
 
   // Return data about the newly created tab.
   if (has_callback()) {
     SetResult(ExtensionTabUtil::CreateTabValue(
         params.target_contents,
         tab_strip, new_index, GetExtension()));
   }
 
   return true;
 }
@@ skipping 168 matching lines @@
   if (update_props->HasKey(keys::kActiveKey))
     EXTENSION_FUNCTION_VALIDATE(update_props->GetBoolean(
         keys::kActiveKey, &active));
 
   if (active) {
     if (tab_strip->active_index() != tab_index) {
       tab_strip->ActivateTabAt(tab_index, false);
       DCHECK_EQ(contents, tab_strip->GetActiveWebContents());
     }
     web_contents_->Focus();
+    web_contents_->GetDelegate()->ActivateContents(web_contents_);
   }
 
   if (update_props->HasKey(keys::kHighlightedKey)) {
     bool highlighted = false;
     EXTENSION_FUNCTION_VALIDATE(update_props->GetBoolean(
         keys::kHighlightedKey, &highlighted));
     if (highlighted != tab_strip->IsTabSelected(tab_index))
       tab_strip->ToggleSelectionAt(tab_index);
   }
 
@@ skipping 810 matching lines @@
           extension->id(),
           script_type,
           code_string,
           frame_scope,
           run_at,
           ScriptExecutor::ISOLATED_WORLD,
           false /* is_web_view */,
           base::Bind(&ExecuteCodeInTabFunction::OnExecuteCodeFinished, this));
   return true;
 }