Add ExtensionFunctionDispatcher::Delegate::GetAssociatedTabContents

chrome/browser/extensions/extension_tabs_module.cc

 // Copyright (c) 2010 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/extension_tabs_module.h"
 
 #include "base/histogram.h"
 #include "base/base64.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
@@ skipping 604 matching lines @@
   if (!GetTabById(tab_id, profile(), include_incognito(),
                   NULL, &tab_strip, &contents, &tab_index, &error_))
     return false;
 
   result_.reset(ExtensionTabUtil::CreateTabValue(contents, tab_strip,
       tab_index));
   return true;
 }
 
 bool GetCurrentTabFunction::RunImpl() {
-  DCHECK(dispatcher() && dispatcher()->render_view_host());
+  DCHECK(dispatcher());
 
-  RenderViewHostDelegate* rvh_delegate =
-      dispatcher()->render_view_host()->delegate();
-
-  TabContents* contents = rvh_delegate->GetAsTabContents();
-  if (contents) {
-    // Caller is running inside a TabContents.
+  TabContents* contents = dispatcher()->delegate()->associated_tab_contents();
+  if (contents)
     result_.reset(ExtensionTabUtil::CreateTabValue(contents));
-    return true;
-  }
-
-  ExtensionHost* host = reinterpret_cast<ExtensionHost*>(rvh_delegate);
-  Browser* browser = GetCurrentBrowser();
-  if (browser && ViewType::EXTENSION_INFOBAR == host->extension_host_type()) {
-    // Unfortunately, now we have to iterate over each TabContents and each
-    // Infobar to try to find the one corresponding to this ExtensionHost.
-    TabStripModel* tab_strip = browser->tabstrip_model();
-    int tab_count = tab_strip->count();
-    for (int tab_index = 0; tab_index < tab_count; ++tab_index) {
-      contents = tab_strip->GetTabContentsAt(tab_index);
-      int infobar_count = contents->infobar_delegate_count();
-      for (int infobar_index = 0; infobar_index < infobar_count;
-          ++infobar_index) {
-        ExtensionInfoBarDelegate* infobar_delegate =
-            contents->GetInfoBarDelegateAt(infobar_index)
-            ->AsExtensionInfoBarDelegate();
-        if (infobar_delegate && infobar_delegate->extension_host() == host) {
-          result_.reset(ExtensionTabUtil::CreateTabValue(contents));
-          return true;
-        }
-      }
-    }
-  }
 
   return true;
 }
 
 bool UpdateTabFunction::RunImpl() {
   int tab_id;
   EXTENSION_FUNCTION_VALIDATE(args_->IsType(Value::TYPE_LIST));
   const ListValue* args = args_as_list();
   EXTENSION_FUNCTION_VALIDATE(args->GetInteger(0, &tab_id));
   DictionaryValue* update_props;
@@ skipping 491 matching lines @@
     // caller.
     use_type = url.is_valid() && (url != resolved_url) ?
         RELATIVE_URL_RESOLUTIONS_DIFFER : RELATIVE_URL_RESOLUTIONS_AGREE;
   }
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.APIUse_RelativeURL", use_type,
       EXTENSION_API_RELATIVE_URL_USE_MAX_VALUE);
 
   return url;
 }