Cleaning up capture_web_contents_function.

chrome/browser/extensions/extension_tab_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_UTIL_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_UTIL_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "ui/base/window_open_disposition.h"
 
 class Browser;
+class ChromeExtensionFunctionDetails;
 class ChromeUIThreadExtensionFunction;
+class ExtensionFunction;
 class GURL;
 class Profile;
 class TabStripModel;
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace content {
@@ skipping 40 matching lines @@
       const OpenTabParams& params,
       std::string* error);
 
   static int GetWindowId(const Browser* browser);
   static int GetWindowIdOfTabStripModel(const TabStripModel* tab_strip_model);
   static int GetTabId(const content::WebContents* web_contents);
   static std::string GetTabStatusText(bool is_loading);
   static int GetWindowIdOfTab(const content::WebContents* web_contents);
   static base::ListValue* CreateTabList(const Browser* browser,
                                         const Extension* extension);
+
+  // DEPRECATED: Please consider using ChromeExtensionFunctionDetails instead
+  // of the deprecated ChromeUIThreadExtensionFunction and use the overload
+  // below
   static Browser* GetBrowserFromWindowID(
       ChromeUIThreadExtensionFunction* function,
       int window_id,
       std::string* error_message);
 
+  static Browser* GetBrowserFromWindowID(
+      const ChromeExtensionFunctionDetails& details,
+      int window_id,
+      std::string* error_message);
+
   // Creates a Tab object (see chrome/common/extensions/api/tabs.json) with
   // information about the state of a browser tab.  Depending on the
   // permissions of the extension, the object may or may not include sensitive
   // data such as the tab's URL.
   static base::DictionaryValue* CreateTabValue(
       content::WebContents* web_contents,
       const Extension* extension) {
     return CreateTabValue(web_contents, NULL, -1, extension);
   }
   static base::DictionaryValue* CreateTabValue(
@@ skipping 70 matching lines @@
   static WindowController* GetWindowControllerOfTab(
       const content::WebContents* web_contents);
 
   // Open the extension's options page.
   static void OpenOptionsPage(const Extension* extension, Browser* browser);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TAB_UTIL_H_