summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_tabs_module.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 16:17:49 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-18 16:17:49 +0000
commit3c9e187bd8ec34ebf2a91a37c868584c465647e8 (patch)
tree84c9540d220fa155cf2af8c944638c0719dee670 /chrome/browser/extensions/extension_tabs_module.h
parent3e35b224fd0c36f17f432f23e2eb3729667210b1 (diff)
downloadchromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.zip
chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.tar.gz
chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.tar.bz2
Make pink's TabContentsWrapper change compile on Windows.
Code by pinkerton@, with modifications by evanm and myself to get it to build on windows/linux/chromeos. BUG=none TEST=none Review URL: http://codereview.chromium.org/4694008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66626 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_tabs_module.h')
-rw-r--r--chrome/browser/extensions/extension_tabs_module.h54
1 files changed, 27 insertions, 27 deletions
diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/extension_tabs_module.h
index 9bf36cb..4307c90 100644
--- a/chrome/browser/extensions/extension_tabs_module.h
+++ b/chrome/browser/extensions/extension_tabs_module.h
@@ -19,35 +19,35 @@ class DictionaryValue;
class ListValue;
class SkBitmap;
class TabContents;
+class TabContentsWrapper;
class TabStripModel;
-class ExtensionTabUtil {
- public:
- static int GetWindowId(const Browser* browser);
- static int GetTabId(const TabContents* tab_contents);
- static std::string GetTabStatusText(bool is_loading);
- static int GetWindowIdOfTab(const TabContents* tab_contents);
- static ListValue* CreateTabList(const Browser* browser);
- static DictionaryValue* CreateTabValue(const TabContents* tab_contents);
- static DictionaryValue* CreateTabValue(const TabContents* tab_contents,
- TabStripModel* tab_strip,
- int tab_index);
- static DictionaryValue* CreateWindowValue(const Browser* browser,
- bool populate_tabs);
- // Gets the |tab_strip_model| and |tab_index| for the given |tab_contents|.
- static bool GetTabStripModel(const TabContents* tab_contents,
- TabStripModel** tab_strip_model,
- int* tab_index);
- static bool GetDefaultTab(Browser* browser, TabContents** contents,
- int* tab_id);
- // Any out parameter (|browser|, |tab_strip|, |contents|, & |tab_index|) may
- // be NULL and will not be set within the function.
- static bool GetTabById(int tab_id, Profile* profile, bool incognito_enabled,
- Browser** browser,
- TabStripModel** tab_strip,
- TabContents** contents,
- int* tab_index);
-};
+namespace ExtensionTabUtil {
+int GetWindowId(const Browser* browser);
+int GetTabId(const TabContents* tab_contents);
+std::string GetTabStatusText(bool is_loading);
+int GetWindowIdOfTab(const TabContents* tab_contents);
+ListValue* CreateTabList(const Browser* browser);
+DictionaryValue* CreateTabValue(const TabContents* tab_contents);
+DictionaryValue* CreateTabValue(const TabContents* tab_contents,
+ TabStripModel* tab_strip,
+ int tab_index);
+DictionaryValue* CreateWindowValue(const Browser* browser,
+ bool populate_tabs);
+// Gets the |tab_strip_model| and |tab_index| for the given |tab_contents|.
+bool GetTabStripModel(const TabContents* tab_contents,
+ TabStripModel** tab_strip_model,
+ int* tab_index);
+bool GetDefaultTab(Browser* browser, TabContentsWrapper** contents,
+ int* tab_id);
+// Any out parameter (|browser|, |tab_strip|, |contents|, & |tab_index|) may
+// be NULL and will not be set within the function.
+bool GetTabById(int tab_id, Profile* profile, bool incognito_enabled,
+ Browser** browser,
+ TabStripModel** tab_strip,
+ TabContentsWrapper** contents,
+ int* tab_index);
+}
// Windows
class GetWindowFunction : public SyncExtensionFunction {