diff options
39 files changed, 28 insertions, 60 deletions
diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc index e42fca8..da3694a 100644 --- a/chrome/browser/extensions/active_tab_permission_granter.cc +++ b/chrome/browser/extensions/active_tab_permission_granter.cc @@ -8,7 +8,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.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_messages.h" diff --git a/chrome/browser/extensions/api/app_window/app_window_api.cc b/chrome/browser/extensions/api/app_window/app_window_api.cc index 3cee683..d474f50 100644 --- a/chrome/browser/extensions/api/app_window/app_window_api.cc +++ b/chrome/browser/extensions/api/app_window/app_window_api.cc @@ -12,7 +12,6 @@ #include "chrome/browser/extensions/window_controller.h" #include "chrome/browser/ui/extensions/native_app_window.h" #include "chrome/browser/ui/extensions/shell_window.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/app_window.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index 6a82b62..d9866f2 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/api/cookies.h" #include "chrome/common/extensions/extension.h" @@ -152,8 +151,7 @@ void AppendToTabIdList(Browser* browser, ListValue* tab_ids) { TabStripModel* tab_strip = browser->tab_strip_model(); for (int i = 0; i < tab_strip->count(); ++i) { tab_ids->Append(Value::CreateIntegerValue( - ExtensionTabUtil::GetTabId( - tab_strip->GetTabContentsAt(i)->web_contents()))); + ExtensionTabUtil::GetTabId(tab_strip->GetWebContentsAt(i)))); } } diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc index 552a7a1..b6e7ac3 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc @@ -25,7 +25,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" 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 e0e201d..ff8d54f 100644 --- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc @@ -16,7 +16,6 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" 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 7544b84..c065eea 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 @@ -17,7 +17,6 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc index ff11af4..2cd19df 100644 --- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.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/features/feature.h" diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc index fa4f9b7..1abce90 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow.cc +++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc @@ -13,7 +13,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/load_notification_details.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc index f91dbe8..a2b2ffd 100644 --- a/chrome/browser/extensions/api/management/management_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_browsertest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc index 966ed86..ee99355 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.cc @@ -17,7 +17,6 @@ #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/feature_switch.h" #include "content/public/browser/render_process_host.h" diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc index 2757a05f..52d2450 100644 --- a/chrome/browser/extensions/api/tabs/tabs.cc +++ b/chrome/browser/extensions/api/tabs/tabs.cc @@ -45,7 +45,6 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/panels/panel_manager.h" #include "chrome/browser/ui/snapshot_tab_helper.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/window_sizer/window_sizer.h" #include "chrome/browser/web_applications/web_app.h" @@ -843,12 +842,12 @@ bool GetSelectedTabFunction::RunImpl() { return false; TabStripModel* tab_strip = browser->tab_strip_model(); - TabContents* contents = tab_strip->GetActiveTabContents(); + WebContents* contents = tab_strip->GetActiveWebContents(); if (!contents) { error_ = keys::kNoSelectedTabError; return false; } - SetResult(ExtensionTabUtil::CreateTabValue(contents->web_contents(), + SetResult(ExtensionTabUtil::CreateTabValue(contents, tab_strip, tab_strip->active_index(), GetExtension())); @@ -950,8 +949,7 @@ bool QueryTabsFunction::RunImpl() { TabStripModel* tab_strip = (*browser)->tab_strip_model(); for (int i = 0; i < tab_strip->count(); ++i) { - const WebContents* web_contents = - tab_strip->GetTabContentsAt(i)->web_contents(); + const WebContents* web_contents = tab_strip->GetWebContentsAt(i); if (index > -1 && i != index) continue; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index 71178ce..6e823d0 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h @@ -37,7 +37,7 @@ class WebNavigationTabObserver public: virtual ~WebNavigationTabObserver(); - // Returns the object for the given |tab_contents|. + // Returns the object for the given |web_contents|. static WebNavigationTabObserver* Get(content::WebContents* web_contents); const FrameNavigationState& frame_navigation_state() const { diff --git a/chrome/browser/extensions/app_notify_channel_ui.h b/chrome/browser/extensions/app_notify_channel_ui.h index 4192471..9ca1a05 100644 --- a/chrome/browser/extensions/app_notify_channel_ui.h +++ b/chrome/browser/extensions/app_notify_channel_ui.h @@ -8,7 +8,10 @@ #include <string> class Profile; -class TabContents; + +namespace content { +class WebContents; +} namespace extensions { @@ -43,7 +46,7 @@ class AppNotifyChannelUI { // Builds the platform specific AppNotifyChannelUI. static AppNotifyChannelUI* Create(Profile* profile, - TabContents* tab_contents, + content::WebContents* web_contents, const std::string& app_name, AppNotifyChannelUI::UIType ui_type); }; diff --git a/chrome/browser/extensions/app_notify_channel_ui_android.cc b/chrome/browser/extensions/app_notify_channel_ui_android.cc index 93887b8..91c721c 100644 --- a/chrome/browser/extensions/app_notify_channel_ui_android.cc +++ b/chrome/browser/extensions/app_notify_channel_ui_android.cc @@ -6,7 +6,6 @@ #include "base/logging.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" namespace extensions { @@ -17,7 +16,7 @@ AppNotifyChannelUIAndroid::~AppNotifyChannelUIAndroid() { // static AppNotifyChannelUI* AppNotifyChannelUI::Create(Profile* profile, - TabContents* tab_contents, + content::WebContents* web_contents, const std::string& app_name, AppNotifyChannelUI::UIType ui_type) { return new AppNotifyChannelUIAndroid(); diff --git a/chrome/browser/extensions/app_notify_channel_ui_impl.cc b/chrome/browser/extensions/app_notify_channel_ui_impl.cc index cd37537..7b2f9f7 100644 --- a/chrome/browser/extensions/app_notify_channel_ui_impl.cc +++ b/chrome/browser/extensions/app_notify_channel_ui_impl.cc @@ -15,7 +15,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/chrome_pages.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/url_constants.h" @@ -94,11 +93,11 @@ void AppNotifyChannelUIImpl::InfoBar::InfoBarDismissed() { AppNotifyChannelUIImpl::AppNotifyChannelUIImpl( Profile* profile, - TabContents* tab_contents, + content::WebContents* web_contents, const std::string& app_name, AppNotifyChannelUI::UIType ui_type) : profile_(profile->GetOriginalProfile()), - tab_contents_(tab_contents), + web_contents_(web_contents), app_name_(app_name), ui_type_(ui_type), delegate_(NULL), @@ -114,10 +113,10 @@ AppNotifyChannelUIImpl::~AppNotifyChannelUIImpl() { // static AppNotifyChannelUI* AppNotifyChannelUI::Create(Profile* profile, - TabContents* tab_contents, + content::WebContents* web_contents, const std::string& app_name, AppNotifyChannelUI::UIType ui_type) { - return new AppNotifyChannelUIImpl(profile, tab_contents, app_name, ui_type); + return new AppNotifyChannelUIImpl(profile, web_contents, app_name, ui_type); } void AppNotifyChannelUIImpl::PromptSyncSetup( @@ -137,7 +136,7 @@ void AppNotifyChannelUIImpl::PromptSyncSetup( } InfoBarTabHelper* infobar_tab_helper = - InfoBarTabHelper::FromWebContents(tab_contents_->web_contents()); + InfoBarTabHelper::FromWebContents(web_contents_); infobar_tab_helper->AddInfoBar(new AppNotifyChannelUIImpl::InfoBar( this, infobar_tab_helper, app_name_)); } @@ -169,8 +168,7 @@ void AppNotifyChannelUIImpl::OnInfoBarResult(bool accepted) { } } // Any existing UI is now closed - display new login UI. - Browser* browser = chrome::FindBrowserWithWebContents( - tab_contents_->web_contents()); + Browser* browser = chrome::FindBrowserWithWebContents(web_contents_); chrome::ShowSettingsSubPage(browser, chrome::kSyncSetupForceLoginSubPage); } diff --git a/chrome/browser/extensions/app_notify_channel_ui_impl.h b/chrome/browser/extensions/app_notify_channel_ui_impl.h index 128ebba..a3c7bc8 100644 --- a/chrome/browser/extensions/app_notify_channel_ui_impl.h +++ b/chrome/browser/extensions/app_notify_channel_ui_impl.h @@ -13,7 +13,10 @@ #include "chrome/browser/extensions/app_notify_channel_ui.h" class Profile; -class TabContents; + +namespace content { +class WebContents; +} namespace extensions { @@ -21,7 +24,7 @@ class AppNotifyChannelUIImpl : public AppNotifyChannelUI, public ProfileSyncServiceObserver { public: AppNotifyChannelUIImpl(Profile* profile, - TabContents* tab_contents, + content::WebContents* web_contents, const std::string& app_name, AppNotifyChannelUI::UIType ui_type); virtual ~AppNotifyChannelUIImpl(); @@ -31,7 +34,7 @@ class AppNotifyChannelUIImpl : public AppNotifyChannelUI, protected: // A private class we use to put up an infobar - its lifetime is managed by - // |tab_contents_|, so we don't have one as an instance variable. + // |web_contents_|, so we don't have one as an instance variable. class InfoBar; friend class AppNotifyChannelUIImpl::InfoBar; @@ -46,7 +49,7 @@ class AppNotifyChannelUIImpl : public AppNotifyChannelUI, void StopObservingSync(); Profile* profile_; - TabContents* tab_contents_; + content::WebContents* web_contents_; std::string app_name_; AppNotifyChannelUI::UIType ui_type_; AppNotifyChannelUI::Delegate* delegate_; diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index d6a68aa..d49f2c9 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/browser_event_router.cc b/chrome/browser/extensions/browser_event_router.cc index 0b372d7..0668523 100644 --- a/chrome/browser/extensions/browser_event_router.cc +++ b/chrome/browser/extensions/browser_event_router.cc @@ -19,7 +19,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index ebd7314..61e5a83 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -19,7 +19,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 3bae1ad..4cc733d 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -29,7 +29,6 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/prefs/prefs_tab_helper.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 5ebf4e3..6276fad 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -22,7 +22,6 @@ #include "chrome/browser/signin/token_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.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_constants.h" diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc index 66795de..d17e76e 100644 --- a/chrome/browser/extensions/extension_install_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc @@ -15,7 +15,6 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/extensions/extension_install_ui_default.cc b/chrome/browser/extensions/extension_install_ui_default.cc index d2cd97c..c6d4b80 100644 --- a/chrome/browser/extensions/extension_install_ui_default.cc +++ b/chrome/browser/extensions/extension_install_ui_default.cc @@ -23,7 +23,6 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/simple_message_box.h" #include "chrome/browser/ui/singleton_tabs.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc index 927edb0..37b7f93 100644 --- a/chrome/browser/extensions/extension_keybinding_apitest.cc +++ b/chrome/browser/extensions/extension_keybinding_apitest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extension_tab_id_map.cc b/chrome/browser/extensions/extension_tab_id_map.cc index e3c92e1..6672458 100644 --- a/chrome/browser/extensions/extension_tab_id_map.cc +++ b/chrome/browser/extensions/extension_tab_id_map.cc @@ -8,7 +8,6 @@ #include "base/bind_helpers.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/tab_contents/retargeting_details.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_details.h" diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 9d91905..1ebe3af 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -15,7 +15,6 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index b3da225..d3b4594 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -15,7 +15,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc index d393b4d..29fea5f 100644 --- a/chrome/browser/extensions/extension_web_ui.cc +++ b/chrome/browser/extensions/extension_web_ui.cc @@ -19,7 +19,6 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index 5962f77..0e80417 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc @@ -11,7 +11,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/extensions/lazy_background_task_queue.cc b/chrome/browser/extensions/lazy_background_task_queue.cc index 50f1665..b5ae6b0 100644 --- a/chrome/browser/extensions/lazy_background_task_queue.cc +++ b/chrome/browser/extensions/lazy_background_task_queue.cc @@ -13,7 +13,6 @@ #include "chrome/browser/extensions/process_map.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_util.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_messages.h" diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc index 769d7a3..8c1de60 100644 --- a/chrome/browser/extensions/menu_manager.cc +++ b/chrome/browser/extensions/menu_manager.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index b8a368d..207e179 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -591,7 +591,7 @@ TEST_F(MenuManagerTest, ExecuteCommand) { .Times(1) .WillOnce(DeleteArg<2>()); } - manager_.ExecuteCommand(&profile, NULL /* tab_contents */, params, id); + manager_.ExecuteCommand(&profile, NULL /* web_contents */, params, id); ASSERT_EQ(2u, list->GetSize()); diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc index 50536e1..6de9be9 100644 --- a/chrome/browser/extensions/options_page_apitest.cc +++ b/chrome/browser/extensions/options_page_apitest.cc @@ -7,7 +7,6 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" @@ -52,5 +51,5 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_OptionsPage) { ASSERT_EQ(2, tab_strip->count()); EXPECT_EQ(extension->GetResourceURL("options.html"), - tab_strip->GetTabContentsAt(1)->web_contents()->GetURL()); + tab_strip->GetWebContentsAt(1)->GetURL()); } diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index dbdbd1c..4b7af55 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -28,7 +28,6 @@ #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/extensions/native_app_window.h" #include "chrome/browser/ui/extensions/shell_window.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index d776bc2..b6064ac 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -10,7 +10,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index eb66333..18ca6ce 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc @@ -13,7 +13,6 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_tabstrip.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" diff --git a/chrome/browser/extensions/script_badge_controller.h b/chrome/browser/extensions/script_badge_controller.h index 5f98172..d4c7332 100644 --- a/chrome/browser/extensions/script_badge_controller.h +++ b/chrome/browser/extensions/script_badge_controller.h @@ -68,7 +68,7 @@ class ScriptBadgeController // Gets the Profile for |web_contents_|. Profile* profile() const; - // Gets the ExtensionService for |tab_contents_|. + // Gets the ExtensionService for |web_contents_|. ExtensionService* GetExtensionService() const; // Gets the current page ID, or -1 if no navigation entry has been committed. diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc index 1e13b38..01c5854 100644 --- a/chrome/browser/extensions/tab_helper.cc +++ b/chrome/browser/extensions/tab_helper.cc @@ -20,7 +20,6 @@ #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser_dialogs.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/web_applications/web_app_ui.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_notification_types.h" @@ -339,9 +338,8 @@ void TabHelper::OnGetAppNotifyChannel(const GURL& requestor_url, return; } - TabContents* tab_contents = TabContents::FromWebContents(web_contents()); AppNotifyChannelUI* ui = AppNotifyChannelUI::Create( - profile, tab_contents, extension->name(), + profile, web_contents(), extension->name(), AppNotifyChannelUI::NOTIFICATION_INFOBAR); scoped_refptr<AppNotifyChannelSetup> channel_setup( diff --git a/chrome/browser/extensions/webstore_installer.cc b/chrome/browser/extensions/webstore_installer.cc index 14b130b..801bcd4 100644 --- a/chrome/browser/extensions/webstore_installer.cc +++ b/chrome/browser/extensions/webstore_installer.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" |