diff options
Diffstat (limited to 'chrome/browser/extensions/api/extension_action')
6 files changed, 20 insertions, 21 deletions
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc index 3eb8730..032b41f 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc @@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) { service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL); // Verify the command worked. - WebContents* tab = browser()->GetSelectedWebContents(); + WebContents* tab = browser()->GetActiveWebContents(); bool result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( tab->GetRenderViewHost(), L"", @@ -196,7 +196,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionAction* browser_action = extension->browser_action(); ASSERT_TRUE(browser_action) @@ -251,7 +251,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionRemovePopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionAction* browser_action = extension->browser_action(); ASSERT_TRUE(browser_action) diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc index 9410fc9..f5fca15 100644 --- a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc @@ -13,7 +13,7 @@ #include "chrome/browser/extensions/extension_tab_helper.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" @@ -84,7 +84,7 @@ bool ExtensionActionFunction::RunImpl() { } } - // Find the TabContentsWrapper that contains this tab id if one is required. + // Find the TabContents that contains this tab id if one is required. if (tab_id_ == ExtensionAction::kDefaultTabId) { EXTENSION_FUNCTION_VALIDATE(GetExtension()->browser_action()); } else { diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.h b/chrome/browser/extensions/api/extension_action/extension_actions_api.h index f9e86d4..0f26136 100644 --- a/chrome/browser/extensions/api/extension_action/extension_actions_api.h +++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.h @@ -13,7 +13,6 @@ namespace base { class DictionaryValue; } class TabContents; -typedef TabContents TabContentsWrapper; // Implementation of both the browserAction and pageAction APIs. // @@ -45,7 +44,7 @@ class ExtensionActionFunction : public SyncExtensionFunction { int tab_id_; // Tab content for |tab_id_| if one exists. - TabContentsWrapper* contents_; + TabContents* contents_; // The extension action for the current extension. ExtensionAction* extension_action_; diff --git a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc index 52f4dd5..a5a9cbb 100644 --- a/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_page_actions_api.cc @@ -13,7 +13,7 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_error_utils.h" @@ -75,8 +75,8 @@ bool PageActionsFunction::SetPageActionEnabled(bool enable) { return false; } - // Find the TabContentsWrapper that contains this tab id. - TabContentsWrapper* contents = NULL; + // Find the TabContents that contains this tab id. + TabContents* contents = NULL; bool result = ExtensionTabUtil::GetTabById( tab_id, profile(), include_incognito(), NULL, NULL, &contents, NULL); if (!result || !contents) { diff --git a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc index a221047..d8c2b55 100644 --- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/test/base/ui_test_utils.h" @@ -33,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) { } // Test that we received the changes. - int tab_id = browser()->GetSelectedTabContentsWrapper()-> + int tab_id = browser()->GetActiveTabContents()-> restore_tab_helper()->session_id().id(); ExtensionAction* action = extension->page_action(); ASSERT_TRUE(action); @@ -43,7 +43,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) { // Simulate the page action being clicked. ResultCatcher catcher; int tab_id = - ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionService* service = browser()->profile()->GetExtensionService(); service->browser_event_router()->PageActionExecuted( browser()->profile(), extension->id(), "", tab_id, "", 0); @@ -59,7 +59,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) { } // Test that we received the changes. - tab_id = browser()->GetSelectedTabContentsWrapper()->restore_tab_helper()-> + tab_id = browser()->GetActiveTabContents()->restore_tab_helper()-> session_id().id(); EXPECT_FALSE(action->GetIcon(tab_id).isNull()); } @@ -71,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageActionAddPopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionAction* page_action = extension->page_action(); ASSERT_TRUE(page_action) @@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageActionRemovePopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionAction* page_action = extension->page_action(); ASSERT_TRUE(page_action) @@ -158,7 +158,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OldPageActions) { { ResultCatcher catcher; int tab_id = - ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionService* service = browser()->profile()->GetExtensionService(); service->browser_event_router()->PageActionExecuted( browser()->profile(), extension->id(), "action", tab_id, "", 1); diff --git a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc index 430596c..073138a 100644 --- a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc @@ -14,7 +14,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" -#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" @@ -72,7 +72,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) { } // Test that we received the changes. - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionAction* action = extension->browser_action(); ASSERT_TRUE(action); EXPECT_EQ("Modified", action->GetTitle(tab_id)); @@ -104,7 +104,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, AddPopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionAction* page_action = extension->browser_action(); ASSERT_TRUE(page_action) @@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, RemovePopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetSelectedWebContents()); + int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); ExtensionAction* page_action = extension->browser_action(); ASSERT_TRUE(page_action) |