diff options
285 files changed, 2219 insertions, 1813 deletions
diff --git a/chrome/browser/accessibility/accessibility_extension_apitest.cc b/chrome/browser/accessibility/accessibility_extension_apitest.cc index 158e58a..0dc9aba 100644 --- a/chrome/browser/accessibility/accessibility_extension_apitest.cc +++ b/chrome/browser/accessibility/accessibility_extension_apitest.cc @@ -7,11 +7,12 @@ #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.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" IN_PROC_BROWSER_TEST_F(ExtensionApiTest, GetAlertsForTab) { - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(tab); InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper(); diff --git a/chrome/browser/accessibility/accessibility_win_browsertest.cc b/chrome/browser/accessibility/accessibility_win_browsertest.cc index c7a9720..ab4bbe8 100644 --- a/chrome/browser/accessibility/accessibility_win_browsertest.cc +++ b/chrome/browser/accessibility/accessibility_win_browsertest.cc @@ -10,6 +10,7 @@ #include "base/utf_string_conversions.h" #include "base/win/scoped_comptr.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -210,10 +211,10 @@ void RecursiveFindNodeInAccessibilityTree( IAccessible* AccessibilityWinBrowserTest::GetRendererAccessible() { content::RenderViewHostTester::EnableAccessibilityUpdatedNotifications( - browser()->GetActiveWebContents()->GetRenderViewHost()); + chrome::GetActiveWebContents(browser())->GetRenderViewHost()); HWND hwnd_render_widget_host_view = - browser()->GetActiveWebContents()->GetRenderWidgetHostView()-> + chrome::GetActiveWebContents(browser())->GetRenderWidgetHostView()-> GetNativeView(); // Invoke windows screen reader detection by sending the WM_GETOBJECT message @@ -233,7 +234,7 @@ AccessibilityWinBrowserTest::GetRendererAccessible() { } void AccessibilityWinBrowserTest::ExecuteScript(wstring script) { - browser()->GetActiveWebContents()->GetRenderViewHost()-> + chrome::GetActiveWebContents(browser())->GetRenderViewHost()-> ExecuteJavascriptInWebFrame(L"", script); } diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm index 956f7c7..58790d4 100644 --- a/chrome/browser/app_controller_mac_browsertest.mm +++ b/chrome/browser/app_controller_mac_browsertest.mm @@ -8,8 +8,9 @@ #include "base/memory/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" -#import "chrome/browser/ui/browser.h" -#import "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #import "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -68,7 +69,7 @@ IN_PROC_BROWSER_TEST_F(AppControllerWebAppBrowserTest, EXPECT_EQ(2u, BrowserList::size()); Browser* browser = *(BrowserList::begin()); - GURL current_url = browser->GetActiveWebContents()->GetURL(); + GURL current_url = chrome::GetActiveWebContents(browser)->GetURL(); EXPECT_EQ(GetAppURL(), current_url.spec()); } diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index e66ccf9..56c43fc 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc @@ -17,6 +17,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#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/omnibox/omnibox_popup_model.h" @@ -155,8 +156,8 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - browser()->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_START_PAGE); + chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL), + content::PAGE_TRANSITION_START_PAGE); observer.Wait(); EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText()); chrome::CloseTab(browser()); diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 53a3d47..830693a 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -19,6 +19,7 @@ #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/translate/translate_manager.h" #include "chrome/browser/ui/browser.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" @@ -132,14 +133,14 @@ class AutofillTest : public InProcessBrowserTest { const std::string& expected_value) { std::string value; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(" L"document.getElementById('" + field_name + L"').value);", &value)); EXPECT_EQ(expected_value, value); } RenderViewHost* render_view_host() { - return browser()->GetActiveWebContents()->GetRenderViewHost(); + return chrome::GetActiveWebContents(browser())->GetRenderViewHost(); } void SimulateURLFetch(bool success) { @@ -184,7 +185,7 @@ class AutofillTest : public InProcessBrowserTest { void FocusFirstNameField() { LOG(WARNING) << "Clicking on the tab."; - ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents()); + ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser())); LOG(WARNING) << "Focusing the first name field."; bool result = false; @@ -213,8 +214,8 @@ class AutofillTest : public InProcessBrowserTest { void SendKeyAndWait(ui::KeyboardCode key, int notification_type) { ui_test_utils::WindowedNotificationObserver observer( notification_type, content::Source<RenderViewHost>(render_view_host())); - ui_test_utils::SimulateKeyPress( - browser()->GetActiveWebContents(), key, false, false, false, false); + ui_test_utils::SimulateKeyPress(chrome::GetActiveWebContents( + browser()), key, false, false, false, false); observer.Wait(); } @@ -622,7 +623,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, MAYBE_AutofillAfterReload) { // Reload the page. LOG(WARNING) << "Reloading the page."; - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); tab->GetController().Reload(false); ui_test_utils::WaitForLoadStop(tab); @@ -679,7 +680,7 @@ IN_PROC_BROWSER_TEST_F(AutofillTest, AutofillAfterTranslate) { render_view_host(), ChromeViewHostMsg_TranslateLanguageDetermined(0, "ja", true)); TranslateInfoBarDelegate* infobar = - browser()->GetActiveTabContents()->infobar_tab_helper()-> + chrome::GetActiveTabContents(browser())->infobar_tab_helper()-> GetInfoBarDelegateAt(0)->AsTranslateInfoBarDelegate(); ASSERT_TRUE(infobar != NULL); diff --git a/chrome/browser/autofill/autofill_popup_view_browsertest.cc b/chrome/browser/autofill/autofill_popup_view_browsertest.cc index d88b649..8d55152 100644 --- a/chrome/browser/autofill/autofill_popup_view_browsertest.cc +++ b/chrome/browser/autofill/autofill_popup_view_browsertest.cc @@ -7,6 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/autofill/test_autofill_external_delegate.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -61,7 +62,7 @@ class AutofillPopupViewBrowserTest : public InProcessBrowserTest { virtual ~AutofillPopupViewBrowserTest() {} virtual void SetUpOnMainThread() OVERRIDE { - web_contents_ = browser()->GetActiveWebContents(); + web_contents_ = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents_ != NULL); autofill_popup_view_.reset(new TestAutofillPopupView( @@ -82,8 +83,8 @@ IN_PROC_BROWSER_TEST_F(AutofillPopupViewBrowserTest, ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED, content::Source<content::WebContents>(web_contents_)); - browser()->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_START_PAGE); + chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL), + content::PAGE_TRANSITION_START_PAGE); observer.Wait(); // The mock verifies that the call was made. diff --git a/chrome/browser/autofill/form_structure_browsertest.cc b/chrome/browser/autofill/form_structure_browsertest.cc index 0a14a3e..220a3b9 100644 --- a/chrome/browser/autofill/form_structure_browsertest.cc +++ b/chrome/browser/autofill/form_structure_browsertest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/autofill/data_driven_test.h" #include "chrome/browser/autofill/form_structure.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/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -59,7 +60,7 @@ void FormStructureBrowserTest::GenerateResults(const std::string& input, HTMLToDataURI(input))); AutofillManager* autofill_manager = - browser()->GetActiveTabContents()->autofill_manager(); + chrome::GetActiveTabContents(browser())->autofill_manager(); ASSERT_NE(static_cast<AutofillManager*>(NULL), autofill_manager); std::vector<FormStructure*> forms = autofill_manager->form_structures_.get(); *output = FormStructureBrowserTest::FormStructuresToString(forms); diff --git a/chrome/browser/automation/automation_misc_browsertest.cc b/chrome/browser/automation/automation_misc_browsertest.cc index 8a27bc2..4b01de4 100644 --- a/chrome/browser/automation/automation_misc_browsertest.cc +++ b/chrome/browser/automation/automation_misc_browsertest.cc @@ -8,6 +8,7 @@ #include "base/callback.h" #include "chrome/browser/automation/automation_provider_observers.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_events.h" #include "chrome/test/base/in_process_browser_test.h" @@ -72,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(AutomationMiscBrowserTest, ProcessMouseEvent) { .Times(2); content::RenderViewHost* view = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( view, L"", diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 7effc33..f4d6d70 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -48,6 +48,7 @@ #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #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/browser_window.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" @@ -294,7 +295,7 @@ void AutomationProvider::DisableInitialLoadObservers() { int AutomationProvider::GetIndexForNavigationController( const NavigationController* controller, const Browser* parent) const { DCHECK(parent); - return parent->GetIndexOfController(controller); + return chrome::GetIndexOfTab(parent, controller->GetWebContents()); } // TODO(phajdan.jr): move to TestingAutomationProvider. diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index bff1f5c..5ea90fc 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -57,6 +57,7 @@ #include "chrome/browser/translate/translate_tab_helper.h" #include "chrome/browser/ui/browser.h" #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/find_bar/find_notification_details.h" #include "chrome/browser/ui/login/login_prompt.h" @@ -970,7 +971,7 @@ bool ExecuteBrowserCommandObserver::CreateAndRegisterObserver( case IDC_FORWARD: case IDC_RELOAD: { new NavigationNotificationObserver( - &browser->GetActiveWebContents()->GetController(), + &chrome::GetActiveWebContents(browser)->GetController(), automation, reply_message, 1, false, false); break; } @@ -2583,7 +2584,7 @@ AllViewsStoppedLoadingObserver::AllViewsStoppedLoadingObserver( ++iter) { Browser* browser = *iter; for (int i = 0; i < browser->tab_count(); ++i) { - TabContents* tab_contents = browser->GetTabContentsAt(i); + TabContents* tab_contents = chrome::GetTabContentsAt(browser, i); StartObserving(tab_contents->automation_tab_helper()); if (tab_contents->automation_tab_helper()->has_pending_loads()) pending_tabs_.insert(tab_contents->web_contents()); diff --git a/chrome/browser/automation/automation_tab_helper_browsertest.cc b/chrome/browser/automation/automation_tab_helper_browsertest.cc index 8f5ffe9..fa7ba87 100644 --- a/chrome/browser/automation/automation_tab_helper_browsertest.cc +++ b/chrome/browser/automation/automation_tab_helper_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/automation/automation_tab_helper.h" #include "chrome/browser/automation/mock_tab_event_observer.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/chrome_paths.h" @@ -91,7 +92,7 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest { std::string script = base::StringPrintf("runTestCase(%d);", test_case_number); content::RenderViewHost* host = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); if (wait_for_response) { ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( host, L"", ASCIIToWide(script))); @@ -104,7 +105,7 @@ class AutomationTabHelperBrowserTest : public InProcessBrowserTest { // Returns the |AutomationTabHelper| for the first browser's first tab. AutomationTabHelper* tab_helper() { - return browser()->GetTabContentsAt(0)->automation_tab_helper(); + return chrome::GetTabContentsAt(browser(), 0)->automation_tab_helper(); } protected: diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index d5d570c..86bfaec 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -24,6 +24,7 @@ #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #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/view_type_utils.h" #include "chrome/common/automation_id.h" @@ -145,7 +146,7 @@ WebContents* GetWebContentsAt(int browser_index, int tab_index) { Browser* browser = GetBrowserAt(browser_index); if (!browser || tab_index >= browser->tab_count()) return NULL; - return browser->GetWebContentsAt(tab_index); + return chrome::GetWebContentsAt(browser, tab_index); } Browser* GetBrowserForTab(WebContents* tab) { @@ -153,7 +154,7 @@ Browser* GetBrowserForTab(WebContents* tab) { for (; browser_iter != BrowserList::end(); ++browser_iter) { Browser* browser = *browser_iter; for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) { - if (browser->GetWebContentsAt(tab_index) == tab) + if (chrome::GetWebContentsAt(browser, tab_index) == tab) return browser; } } @@ -452,7 +453,7 @@ bool GetTabForId(const AutomationId& id, WebContents** tab) { for (; iter != BrowserList::end(); ++iter) { Browser* browser = *iter; for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) { - TabContents* tab_contents = browser->GetTabContentsAt(tab_index); + TabContents* tab_contents = chrome::GetTabContentsAt(browser, tab_index); if (base::IntToString( tab_contents->restore_tab_helper()->session_id().id()) == id.id()) { diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 4158223..0a33e7d 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -105,6 +105,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #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/extensions/application_launch.h" #include "chrome/browser/ui/find_bar/find_bar.h" @@ -485,7 +486,7 @@ void TestingAutomationProvider::ActivateTab(int handle, if (browser_tracker_->ContainsHandle(handle) && at_index > -1) { Browser* browser = browser_tracker_->GetResource(handle); if (at_index >= 0 && at_index < browser->tab_count()) { - browser->ActivateTabAt(at_index, true); + chrome::ActivateTabAt(browser, at_index, true); *status = 0; } } @@ -501,8 +502,8 @@ void TestingAutomationProvider::AppendTab(int handle, Browser* browser = browser_tracker_->GetResource(handle); observer = new TabAppendedNotificationObserver(browser, this, reply_message); - TabContents* contents = - browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + TabContents* contents = chrome::AddSelectedTabWithURL( + browser, url, content::PAGE_TRANSITION_TYPED); if (contents) { append_tab_response = GetIndexForNavigationController( &contents->web_contents()->GetController(), browser); @@ -547,7 +548,7 @@ void TestingAutomationProvider::CloseTab(int tab_handle, controller->GetWebContents()); DCHECK(browser); new TabClosedNotificationObserver(this, wait_until_closed, reply_message); - browser->CloseTabContents(controller->GetWebContents()); + chrome::CloseWebContents(browser, controller->GetWebContents()); return; } @@ -1058,7 +1059,7 @@ void TestingAutomationProvider::GetTab(int win_handle, if (browser_tracker_->ContainsHandle(win_handle) && (tab_index >= 0)) { Browser* browser = browser_tracker_->GetResource(win_handle); if (tab_index < browser->tab_count()) { - WebContents* web_contents = browser->GetWebContentsAt(tab_index); + WebContents* web_contents = chrome::GetWebContentsAt(browser, tab_index); *tab_handle = tab_tracker_->Add(&web_contents->GetController()); } } @@ -1087,7 +1088,7 @@ void TestingAutomationProvider::GetTabIndex(int handle, int* tabstrip_index) { NavigationController* tab = tab_tracker_->GetResource(handle); Browser* browser = browser::FindBrowserWithWebContents( tab->GetWebContents()); - *tabstrip_index = browser->GetIndexOfController(tab); + *tabstrip_index = chrome::GetIndexOfTab(browser, tab->GetWebContents()); } } @@ -2217,7 +2218,7 @@ void TestingAutomationProvider::PerformActionOnInfobar( return; } - TabContents* tab_contents = browser->GetTabContentsAt(tab_index); + TabContents* tab_contents = chrome::GetTabContentsAt(browser, tab_index); if (!tab_contents) { reply.SendError(StringPrintf("No such tab at index %d", tab_index)); return; @@ -2413,14 +2414,14 @@ void TestingAutomationProvider::GetBrowserInfo( // one dictionary item per tab. ListValue* tabs = new ListValue; for (int i = 0; i < browser->tab_count(); ++i) { - WebContents* wc = browser->GetWebContentsAt(i); + WebContents* wc = chrome::GetWebContentsAt(browser, i); DictionaryValue* tab = new DictionaryValue; tab->SetInteger("index", i); tab->SetString("url", wc->GetURL().spec()); tab->SetInteger("renderer_pid", base::GetProcId(wc->GetRenderProcessHost()->GetHandle())); tab->Set("infobars", GetInfobarsInfo(wc)); - tab->SetBoolean("pinned", browser->IsTabPinned(i)); + tab->SetBoolean("pinned", browser->tab_strip_model()->IsTabPinned(i)); tabs->Append(tab); } browser_item->Set("tabs", tabs); @@ -2548,7 +2549,7 @@ void TestingAutomationProvider::GetNavigationInfo( int tab_index; WebContents* web_contents = NULL; if (!args->GetInteger("tab_index", &tab_index) || - !(web_contents = browser->GetWebContentsAt(tab_index))) { + !(web_contents = chrome::GetWebContentsAt(browser, tab_index))) { reply.SendError("tab_index missing or invalid."); return; } @@ -3187,7 +3188,7 @@ void TestingAutomationProvider::OmniboxAcceptInput( DictionaryValue* args, IPC::Message* reply_message) { NavigationController& controller = - browser->GetActiveWebContents()->GetController(); + chrome::GetActiveWebContents(browser)->GetController(); LocationBar* loc_bar = browser->window()->GetLocationBar(); if (!loc_bar) { AutomationJSONReply(this, reply_message).SendError( @@ -3362,7 +3363,7 @@ void TestingAutomationProvider::SaveTabContents( .SendError("tab_index or filename param missing"); return; } else { - web_contents = browser->GetWebContentsAt(tab_index); + web_contents = chrome::GetWebContentsAt(browser, tab_index); if (!web_contents) { AutomationJSONReply(this, reply_message).SendError("no tab at tab_index"); return; @@ -3675,7 +3676,7 @@ TabContents* GetTabContentsFromDict(const Browser* browser, return NULL; } - TabContents* tab_contents = browser->GetTabContentsAt(tab_index); + TabContents* tab_contents = chrome::GetTabContentsAt(browser, tab_index); if (!tab_contents) { *error_message = StringPrintf("No tab at index %d.", tab_index); return NULL; @@ -4516,8 +4517,7 @@ void TestingAutomationProvider::GetAutofillProfile( return; } - TabContents* tab_contents = - browser->GetTabContentsAt(tab_index); + TabContents* tab_contents = chrome::GetTabContentsAt(browser, tab_index); if (tab_contents) { PersonalDataManager* pdm = PersonalDataManagerFactory::GetForProfile( tab_contents->profile()->GetOriginalProfile()); @@ -4582,7 +4582,7 @@ void TestingAutomationProvider::FillAutofillProfile( return; } - TabContents* tab_contents = browser->GetTabContentsAt(tab_index); + TabContents* tab_contents = chrome::GetTabContentsAt(browser, tab_index); if (tab_contents) { PersonalDataManager* pdm = @@ -4626,7 +4626,7 @@ void TestingAutomationProvider::SubmitAutofillForm( .SendError("'tab_index' missing or invalid."); return; } - TabContents* tab_contents = browser->GetTabContentsAt(tab_index); + TabContents* tab_contents = chrome::GetTabContentsAt(browser, tab_index); if (!tab_contents) { AutomationJSONReply(this, reply_message).SendError( StringPrintf("No such tab at index %d", tab_index)); @@ -4681,7 +4681,7 @@ void TestingAutomationProvider::AutofillTriggerSuggestions( return; } - WebContents* web_contents = browser->GetWebContentsAt(tab_index); + WebContents* web_contents = chrome::GetWebContentsAt(browser, tab_index); if (!web_contents) { AutomationJSONReply(this, reply_message).SendError( StringPrintf("No such tab at index %d", tab_index)); @@ -4705,7 +4705,7 @@ void TestingAutomationProvider::AutofillHighlightSuggestion( return; } - WebContents* web_contents = browser->GetWebContentsAt(tab_index); + WebContents* web_contents = chrome::GetWebContentsAt(browser, tab_index); if (!web_contents) { AutomationJSONReply(this, reply_message).SendError( StringPrintf("No such tab at index %d", tab_index)); @@ -4738,7 +4738,7 @@ void TestingAutomationProvider::AutofillAcceptSelection( return; } - WebContents* web_contents = browser->GetWebContentsAt(tab_index); + WebContents* web_contents = chrome::GetWebContentsAt(browser, tab_index); if (!web_contents) { AutomationJSONReply(this, reply_message).SendError( StringPrintf("No such tab at index %d", tab_index)); @@ -5446,8 +5446,8 @@ void TestingAutomationProvider::SendOSLevelKeyEventToTab( } // The key events will be sent to the browser window, we need the current tab // containing the element we send the text in to be shown. - browser->ActivateTabAt( - browser->GetIndexOfController(&web_contents->GetController()), true); + chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, web_contents), + true); BrowserWindow* browser_window = browser->window(); if (!browser_window) { @@ -5704,7 +5704,7 @@ void TestingAutomationProvider::LaunchApp( service->extension_prefs()->GetLaunchContainer( extension, ExtensionPrefs::LAUNCH_REGULAR); - WebContents* old_contents = browser->GetActiveWebContents(); + WebContents* old_contents = chrome::GetActiveWebContents(browser); if (!old_contents) { AutomationJSONReply(this, reply_message).SendError( "Cannot identify selected tab contents."); @@ -5791,7 +5791,7 @@ void TestingAutomationProvider::GetV8HeapStats( return; } - web_contents = browser->GetWebContentsAt(tab_index); + web_contents = chrome::GetWebContentsAt(browser, tab_index); if (!web_contents) { AutomationJSONReply(this, reply_message).SendError( StringPrintf("Could not get WebContents at tab index %d", tab_index)); @@ -5825,7 +5825,7 @@ void TestingAutomationProvider::GetFPS( return; } - web_contents = browser->GetWebContentsAt(tab_index); + web_contents = chrome::GetWebContentsAt(browser, tab_index); if (!web_contents) { AutomationJSONReply(this, reply_message).SendError( StringPrintf("Could not get WebContents at tab index %d", tab_index)); @@ -5864,7 +5864,7 @@ void TestingAutomationProvider::IsMouseLocked(Browser* browser, base::DictionaryValue* args, IPC::Message* reply_message) { DictionaryValue dict; - dict.SetBoolean("result", browser->GetActiveWebContents()-> + dict.SetBoolean("result", chrome::GetActiveWebContents(browser)-> GetRenderViewHost()->GetView()->IsMouseLocked()); AutomationJSONReply(this, reply_message).SendSuccess(&dict); } @@ -5921,7 +5921,7 @@ void TestingAutomationProvider::AcceptCurrentFullscreenOrMouseLockRequest( Browser* browser, base::DictionaryValue* args, IPC::Message* reply_message) { - WebContents* fullscreen_tab = browser->GetActiveWebContents(); + WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser); FullscreenExitBubbleType type = browser->fullscreen_controller_->GetFullscreenExitBubbleType(); browser->OnAcceptFullscreenPermission(fullscreen_tab->GetURL(), type); @@ -6064,7 +6064,7 @@ void TestingAutomationProvider::GetIndicesFromTab( for (; iter != BrowserList::end(); ++iter, ++browser_index) { Browser* browser = *iter; for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) { - TabContents* tab = browser->GetTabContentsAt(tab_index); + TabContents* tab = chrome::GetTabContentsAt(browser, tab_index); if (tab->restore_tab_helper()->session_id().id() == id) { DictionaryValue dict; dict.SetInteger("windex", browser_index); @@ -6410,7 +6410,7 @@ void TestingAutomationProvider::GetTabIds( for (; iter != BrowserList::end(); ++iter) { Browser* browser = *iter; for (int i = 0; i < browser->tab_count(); ++i) { - int id = browser->GetTabContentsAt(i)->restore_tab_helper()-> + int id = chrome::GetTabContentsAt(browser, i)->restore_tab_helper()-> session_id().id(); id_list->Append(Value::CreateIntegerValue(id)); } @@ -6429,7 +6429,7 @@ void TestingAutomationProvider::GetViews( for (; browser_iter != BrowserList::end(); ++browser_iter) { Browser* browser = *browser_iter; for (int i = 0; i < browser->tab_count(); ++i) { - TabContents* tab = browser->GetTabContentsAt(i); + TabContents* tab = chrome::GetTabContentsAt(browser, i); DictionaryValue* dict = new DictionaryValue(); AutomationId id = automation_util::GetIdForTab(tab); dict->Set("auto_id", id.ToValue()); @@ -6482,7 +6482,7 @@ void TestingAutomationProvider::IsTabIdValid( for (; iter != BrowserList::end(); ++iter) { Browser* browser = *iter; for (int i = 0; i < browser->tab_count(); ++i) { - TabContents* tab = browser->GetTabContentsAt(i); + TabContents* tab = chrome::GetTabContentsAt(browser, i); if (tab->restore_tab_helper()->session_id().id() == id) { is_valid = true; break; @@ -6518,7 +6518,7 @@ void TestingAutomationProvider::CloseTabJSON( std::string error; // Close tabs synchronously. if (GetBrowserAndTabFromJSONArgs(args, &browser, &tab, &error)) { - browser->CloseTabContents(tab); + chrome::CloseWebContents(browser, tab); reply.SendSuccess(NULL); return; } @@ -6598,8 +6598,8 @@ void TestingAutomationProvider::ActivateTabJSON( reply.SendError(error); return; } - browser->ActivateTabAt( - browser->GetIndexOfController(&web_contents->GetController()), true); + chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, web_contents), + true); reply.SendSuccess(NULL); } @@ -6737,8 +6737,6 @@ void TestingAutomationProvider::OnRemoveProvider() { void TestingAutomationProvider::EnsureTabSelected(Browser* browser, WebContents* tab) { - if (browser->GetActiveWebContents() != tab) { - browser->ActivateTabAt(browser->GetIndexOfController( - &tab->GetController()), true); - } + if (chrome::GetActiveWebContents(browser) != tab) + chrome::ActivateTabAt(browser, chrome::GetIndexOfTab(browser, tab), true); } diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index 6314e74..844b060 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -23,6 +23,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" @@ -613,7 +614,8 @@ void BackgroundContentsService::AddWebContents( bool user_gesture) { Browser* browser = browser::FindLastActiveWithProfile( Profile::FromBrowserContext(new_contents->GetBrowserContext())); - if (!browser) - return; - browser->AddWebContents(new_contents, disposition, initial_pos, user_gesture); + if (browser) { + chrome::AddWebContents(browser, NULL, new_contents, disposition, + initial_pos, user_gesture); + } } diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc index a7add44..e9d8efe 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc @@ -13,6 +13,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/common/pref_names.h" #include "content/public/browser/page_navigator.h" @@ -173,7 +174,7 @@ void BookmarkContextMenuController::ExecuteCommand(int id) { GURL url; string16 title; bookmark_utils::GetURLAndTitleToBookmark( - browser_->GetActiveWebContents(), &url, &title); + chrome::GetActiveWebContents(browser_), &url, &title); BookmarkEditor::Show( parent_window_, profile_, diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 079cd8d..1135000 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -22,6 +22,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/simple_message_box.h" #include "chrome/common/pref_names.h" @@ -386,14 +387,14 @@ void OpenAll(gfx::NativeWindow parent, NewBrowserPageNavigator navigator_impl(profile); if (!navigator) { Browser* browser = browser::FindTabbedBrowser(profile, false); - if (!browser || !browser->GetActiveWebContents()) { + if (!browser || !chrome::GetActiveWebContents(browser)) { navigator = &navigator_impl; } else { if (initial_disposition != NEW_WINDOW && initial_disposition != OFF_THE_RECORD) { browser->window()->Activate(); } - navigator = browser->GetActiveWebContents(); + navigator = chrome::GetActiveWebContents(browser); } } @@ -664,8 +665,9 @@ void GetURLsForOpenTabs( std::vector<std::pair<GURL, string16> >* urls) { for (int i = 0; i < browser->tab_count(); ++i) { std::pair<GURL, string16> entry; - GetURLAndTitleToBookmark(browser->GetWebContentsAt(i), &(entry.first), - &(entry.second)); + GetURLAndTitleToBookmark( + chrome::GetWebContentsAt(browser, i), &(entry.first), + &(entry.second)); urls->push_back(entry); } } diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index 1f9544d..c0385db 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" @@ -36,7 +37,7 @@ TEST_F(BrowserCommandsTest, TabNavigationAccelerators) { AddTab(browser(), about_blank); // Select the second tab. - browser()->ActivateTabAt(1, false); + chrome::ActivateTabAt(browser(), 1, false); CommandUpdater* updater = browser()->command_controller()->command_updater(); @@ -82,7 +83,7 @@ TEST_F(BrowserCommandsTest, DuplicateTab) { // Verify the stack of urls. content::NavigationController& controller = - browser()->GetWebContentsAt(1)->GetController(); + chrome::GetWebContentsAt(browser(), 1)->GetController(); ASSERT_EQ(3, controller.GetEntryCount()); ASSERT_EQ(2, controller.GetCurrentEntryIndex()); ASSERT_TRUE(url1 == controller.GetEntryAtIndex(0)->GetURL()); @@ -123,19 +124,19 @@ TEST_F(BrowserCommandsTest, BackForwardInNewTab) { ASSERT_EQ(2, browser()->tab_count()); // The original tab should be unchanged. - WebContents* zeroth = browser()->GetWebContentsAt(0); + WebContents* zeroth = chrome::GetWebContentsAt(browser(), 0); EXPECT_EQ(url2, zeroth->GetURL()); EXPECT_TRUE(zeroth->GetController().CanGoBack()); EXPECT_FALSE(zeroth->GetController().CanGoForward()); // The new tab should be like the first one but navigated back. - WebContents* first = browser()->GetWebContentsAt(1); - EXPECT_EQ(url1, browser()->GetWebContentsAt(1)->GetURL()); + WebContents* first = chrome::GetWebContentsAt(browser(), 1); + EXPECT_EQ(url1, chrome::GetWebContentsAt(browser(), 1)->GetURL()); EXPECT_FALSE(first->GetController().CanGoBack()); EXPECT_TRUE(first->GetController().CanGoForward()); // Select the second tab and make it go forward in a new background tab. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); // TODO(brettw) bug 11055: It should not be necessary to commit the load here, // but because of this bug, it will assert later if we don't. When the bug is // fixed, one of the three commits here related to this bug should be removed @@ -152,25 +153,25 @@ TEST_F(BrowserCommandsTest, BackForwardInNewTab) { // There should be a new tab navigated forward. ASSERT_EQ(3, browser()->tab_count()); - WebContents* second = browser()->GetWebContentsAt(2); + WebContents* second = chrome::GetWebContentsAt(browser(), 2); EXPECT_EQ(url2, second->GetURL()); EXPECT_TRUE(second->GetController().CanGoBack()); EXPECT_FALSE(second->GetController().CanGoForward()); // Now do back in a new foreground tab. Don't bother re-checking every sngle // thing above, just validate that it's opening properly. - browser()->ActivateTabAt(2, true); + chrome::ActivateTabAt(browser(), 2, true); // TODO(brettw) bug 11055: see the comment above about why we need this. CommitPendingLoad(&second->GetController()); chrome::GoBack(browser(), NEW_FOREGROUND_TAB); ASSERT_EQ(3, browser()->active_index()); - ASSERT_EQ(url1, browser()->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1, chrome::GetActiveWebContents(browser())->GetURL()); // Same thing again for forward. // TODO(brettw) bug 11055: see the comment above about why we need this. - CommitPendingLoad(&browser()->GetActiveWebContents()->GetController()); + CommitPendingLoad(&chrome::GetActiveWebContents(browser())->GetController()); chrome::GoForward(browser(), NEW_FOREGROUND_TAB); ASSERT_EQ(4, browser()->active_index()); - ASSERT_EQ(url2, browser()->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url2, chrome::GetActiveWebContents(browser())->GetURL()); } diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc index a730af4..00bcd16 100644 --- a/chrome/browser/browser_encoding_browsertest.cc +++ b/chrome/browser/browser_encoding_browsertest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -43,7 +44,7 @@ class BrowserEncodingTest : public InProcessBrowserTest { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_SAVE_PACKAGE_SUCCESSFULLY_FINISHED, content::NotificationService::AllSources()); - browser()->GetActiveWebContents()->SavePage( + chrome::GetActiveWebContents(browser())->SavePage( full_file_name, temp_sub_resource_dir_, content::SAVE_PAGE_TYPE_AS_COMPLETE_HTML); observer.Wait(); @@ -139,7 +140,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAliasMapping) { ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); EXPECT_EQ(kEncodingTestDatas[i].encoding_name, - browser()->GetActiveWebContents()->GetEncoding()); + chrome::GetActiveWebContents(browser())->GetEncoding()); chrome::CloseTab(browser()); } } @@ -155,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) { test_dir_path = test_dir_path.AppendASCII(kTestFileName); GURL url = URLRequestMockHTTPJob::GetMockUrl(test_dir_path); ui_test_utils::NavigateToURL(browser(), url); - content::WebContents* web_contents = browser()->GetActiveWebContents(); + content::WebContents* web_contents = chrome::GetActiveWebContents(browser()); EXPECT_EQ("ISO-8859-1", web_contents->GetEncoding()); // Override the encoding to "gb18030". @@ -259,7 +260,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) { browser()->profile()->GetPrefs()->SetString(prefs::kDefaultCharset, "ISO-8859-4"); - content::WebContents* web_contents = browser()->GetActiveWebContents(); + content::WebContents* web_contents = chrome::GetActiveWebContents(browser()); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kTestDatas); ++i) { // Disable auto detect if it is on. browser()->profile()->GetPrefs()->SetBoolean( diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 78c2da3..9a5179f 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -14,6 +14,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -325,8 +326,10 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { ui_test_utils::NavigateToURL(browser(), url); // Create several tabs. - for (int i = 0; i < 4; ++i) - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + for (int i = 0; i < 4; ++i) { + chrome::AddSelectedTabWithURL(browser(), url, + content::PAGE_TRANSITION_TYPED); + } // Alternate focus for the tab. const bool kFocusPage[3][5] = { @@ -338,11 +341,11 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { for (int i = 1; i < 3; i++) { for (int j = 0; j < 5; j++) { // Activate the tab. - browser()->ActivateTabAt(j, true); + chrome::ActivateTabAt(browser(), j, true); // Activate the location bar or the page. if (kFocusPage[i][j]) { - browser()->GetWebContentsAt(j)->GetView()->Focus(); + chrome::GetWebContentsAt(browser(), j)->GetView()->Focus(); } else { chrome::FocusLocationBar(browser()); } @@ -351,14 +354,14 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { // Now come back to the tab and check the right view is focused. for (int j = 0; j < 5; j++) { // Activate the tab. - browser()->ActivateTabAt(j, true); + chrome::ActivateTabAt(browser(), j, true); ViewID vid = kFocusPage[i][j] ? VIEW_ID_TAB_CONTAINER : location_bar_focus_view_id_; ASSERT_TRUE(IsViewFocused(vid)); } - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); // Try the above, but with ctrl+tab. Since tab normally changes focus, // this has regressed in the past. Loop through several times to be sure. for (int j = 0; j < 15; j++) { @@ -371,7 +374,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocus) { } // As above, but with ctrl+shift+tab. - browser()->ActivateTabAt(4, true); + chrome::ActivateTabAt(browser(), 4, true); for (int j = 14; j >= 0; --j) { ViewID vid = kFocusPage[i][j % 5] ? VIEW_ID_TAB_CONTAINER : location_bar_focus_view_id_; @@ -393,7 +396,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) { ui_test_utils::NavigateToURL(browser(), url); chrome::Find(browser()); - ui_test_utils::FindInPage(browser()->GetActiveTabContents(), + ui_test_utils::FindInPage(chrome::GetActiveTabContents(browser()), ASCIIToUTF16("a"), true, false, NULL); ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); @@ -401,23 +404,23 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_TabsRememberFocusFindInPage) { chrome::FocusLocationBar(browser()); // Create a 2nd tab. - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); // Focus should be on the recently opened tab page. ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); // Select 1st tab, focus should still be on the location-bar. // (bug http://crbug.com/23296) - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_)); // Now open the find box again, switch to another tab and come back, the focus // should return to the find box. chrome::Find(browser()); ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); } @@ -464,7 +467,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, focused_browser->window()->Activate(); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( - unfocused_browser->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(unfocused_browser)->GetRenderViewHost(), L"", L"stealFocus();")); // Make sure the first browser is still active. @@ -483,7 +486,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) { chrome::FocusLocationBar(browser()); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"stealFocus();")); // Make sure the location bar is still focused. @@ -529,7 +532,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { // Let's make sure the focus is on the expected element in the page. std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(getFocusedElement());", &actual)); @@ -546,7 +549,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { browser(), ui::VKEY_TAB, false, false, false, false, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE, content::NotificationSource(content::Source<RenderViewHost>( - browser()->GetActiveWebContents()->GetRenderViewHost())), + chrome::GetActiveWebContents(browser())->GetRenderViewHost())), details)); } else { // On the last tab key press, the focus returns to the browser. @@ -589,7 +592,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { browser(), ui::VKEY_TAB, false, true, false, false, content::NOTIFICATION_FOCUS_CHANGED_IN_PAGE, content::NotificationSource(content::Source<RenderViewHost>( - browser()->GetActiveWebContents()->GetRenderViewHost())), + chrome::GetActiveWebContents(browser())->GetRenderViewHost())), details)); } else { // On the last tab key press, the focus returns to the browser. @@ -602,7 +605,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) { // Let's make sure the focus is on the expected element in the page. std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(getFocusedElement());", &actual)); @@ -630,7 +633,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { // Let's show an interstitial. TestInterstitialPage* interstitial_page = - new TestInterstitialPage(browser()->GetActiveWebContents(), + new TestInterstitialPage(chrome::GetActiveWebContents(browser()), true, GURL("http://interstitial.com")); // Give some time for the interstitial to show. MessageLoop::current()->PostDelayedTask(FROM_HERE, @@ -750,12 +753,12 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, InterstitialFocus) { // Page should have focus. ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); - EXPECT_TRUE(browser()->GetActiveWebContents()->GetRenderViewHost()-> + EXPECT_TRUE(chrome::GetActiveWebContents(browser())->GetRenderViewHost()-> GetView()->HasFocus()); // Let's show an interstitial. TestInterstitialPage* interstitial_page = - new TestInterstitialPage(browser()->GetActiveWebContents(), + new TestInterstitialPage(chrome::GetActiveWebContents(browser()), true, GURL("http://interstitial.com")); // Give some time for the interstitial to show. MessageLoop::current()->PostDelayedTask(FROM_HERE, @@ -841,26 +844,26 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabInitialFocus) { // Open the history tab, focus should be on the tab contents. chrome::ShowHistory(browser()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::WaitForLoadStop( - browser()->GetActiveWebContents())); + chrome::GetActiveWebContents(browser()))); EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); // Open the new tab, focus should be on the location bar. chrome::NewTab(browser()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::WaitForLoadStop( - browser()->GetActiveWebContents())); + chrome::GetActiveWebContents(browser()))); EXPECT_TRUE(IsViewFocused(location_bar_focus_view_id_)); // Open the download tab, focus should be on the tab contents. chrome::ShowDownloads(browser()); ASSERT_NO_FATAL_FAILURE(ui_test_utils::WaitForLoadStop( - browser()->GetActiveWebContents())); + chrome::GetActiveWebContents(browser()))); EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); // Open about:blank, focus should be on the location bar. - browser()->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL), + content::PAGE_TRANSITION_LINK); ASSERT_NO_FATAL_FAILURE(ui_test_utils::WaitForLoadStop( - browser()->GetActiveWebContents())); + chrome::GetActiveWebContents(browser()))); EXPECT_TRUE(IsViewFocused(location_bar_focus_view_id_)); } @@ -883,7 +886,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); } @@ -898,7 +901,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnReload) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); } @@ -915,12 +918,12 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FocusOnReloadCrashedTab) { // Open a regular page, crash, reload. ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(kSimplePage)); - ui_test_utils::CrashTab(browser()->GetActiveWebContents()); + ui_test_utils::CrashTab(chrome::GetActiveWebContents(browser())); { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); } diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index a9703a0..7f0d3cc 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -11,6 +11,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/in_process_browser_test.h" @@ -146,7 +147,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); bool actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kSuppressEventJS, type, GetBoolString(!suppress)), &actual)); @@ -172,7 +173,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { void GetResultLength(int tab_index, int* length) { ASSERT_LT(tab_index, browser()->tab_count()); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", kGetResultLengthJS, length)); } @@ -184,7 +185,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { for (int i = 0; i < actual_length; ++i) { std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kGetResultJS, i), &actual)); // If more events were received than expected, then the additional events @@ -200,7 +201,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", kGetFocusedElementJS, &actual)); ASSERT_EQ(WideToUTF8(focused), actual); } @@ -209,7 +210,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); bool actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kSetFocusedElementJS, focused), &actual)); @@ -221,7 +222,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kGetTextBoxValueJS, id), &actual)); @@ -233,7 +234,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); std::string actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kSetTextBoxValueJS, id, value), &actual)); @@ -244,7 +245,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { ASSERT_LT(tab_index, browser()->tab_count()); bool actual; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost(), + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost(), L"", base::StringPrintf(kStartTestJS, result_length), &actual)); ASSERT_TRUE(actual); } @@ -264,7 +265,7 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { // because the test finished message might be arrived before returning // from the SendKeyPressSync() method. TestFinishObserver finish_observer( - browser()->GetWebContentsAt(tab_index)->GetRenderViewHost()); + chrome::GetWebContentsAt(browser(), tab_index)->GetRenderViewHost()); ASSERT_TRUE(ui_test_utils::SendKeyPressSync( browser(), test.key, test.ctrl, test.shift, test.alt, test.command)); @@ -737,7 +738,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) { ui_test_utils::WindowedNotificationObserver wait_for_tab_closed( content::NOTIFICATION_WEB_CONTENTS_DESTROYED, - content::Source<content::WebContents>(browser()->GetWebContentsAt(1))); + content::Source<content::WebContents>(chrome::GetWebContentsAt(browser(), 1))); // Press Ctrl/Cmd+W, which will close the tab. #if defined(OS_MACOSX) diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index 1685eeb..fc9f3b2 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -24,6 +24,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" @@ -916,7 +917,7 @@ CaptivePortalTabReloader::State CaptivePortalBrowserTest::GetStateOfTabReloader( CaptivePortalTabReloader::State CaptivePortalBrowserTest::GetStateOfTabReloaderAt(Browser* browser, int index) const { - return GetStateOfTabReloader(browser->GetTabContentsAt(index)); + return GetStateOfTabReloader(chrome::GetTabContentsAt(browser, index)); } int CaptivePortalBrowserTest::NumTabsWithState( @@ -961,7 +962,7 @@ void CaptivePortalBrowserTest::NavigateToPageExpectNoTest( void CaptivePortalBrowserTest::SlowLoadNoCaptivePortal( Browser* browser, Result expected_result) { CaptivePortalTabReloader* tab_reloader = - GetTabReloader(browser->GetActiveTabContents()); + GetTabReloader(chrome::GetActiveTabContents(browser)); ASSERT_TRUE(tab_reloader); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta()); @@ -1004,7 +1005,7 @@ void CaptivePortalBrowserTest::FastTimeoutNoCaptivePortal( // Set the load time to be large, so the timer won't trigger. The value is // not restored at the end of the function. CaptivePortalTabReloader* tab_reloader = - GetTabReloader(browser->GetActiveTabContents()); + GetTabReloader(chrome::GetActiveTabContents(browser)); ASSERT_TRUE(tab_reloader); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromHours(1)); @@ -1034,7 +1035,7 @@ void CaptivePortalBrowserTest::FastTimeoutNoCaptivePortal( // Check that the right tab was navigated, and there were no extra // navigations. EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser->GetWebContentsAt(active_index))); + chrome::GetWebContentsAt(browser, active_index))); EXPECT_EQ(0, NumLoadingTabs()); // Check the tab's state, and verify no captive portal check is pending. @@ -1051,11 +1052,11 @@ void CaptivePortalBrowserTest::SlowLoadBehindCaptivePortal( bool expect_open_login_tab) { // Calling this on a tab that's waiting for a load to manually be timed out // will result in a hang. - ASSERT_FALSE(browser->GetActiveWebContents()->IsLoading()); + ASSERT_FALSE(chrome::GetActiveWebContents(browser)->IsLoading()); // Trigger a captive portal check quickly. CaptivePortalTabReloader* tab_reloader = - GetTabReloader(browser->GetActiveTabContents()); + GetTabReloader(chrome::GetActiveTabContents(browser)); ASSERT_TRUE(tab_reloader); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta()); @@ -1066,7 +1067,7 @@ void CaptivePortalBrowserTest::SlowLoadBehindCaptivePortal( int initial_loading_tabs = NumLoadingTabs(); int expected_broken_tabs = NumBrokenTabs(); if (CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL != - GetStateOfTabReloader(browser->GetActiveTabContents())) { + GetStateOfTabReloader(chrome::GetActiveTabContents(browser))) { ++expected_broken_tabs; } @@ -1086,10 +1087,10 @@ void CaptivePortalBrowserTest::SlowLoadBehindCaptivePortal( EXPECT_EQ(initial_tab_count, browser->active_index()); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser->GetWebContentsAt(initial_tab_count))); + chrome::GetWebContentsAt(browser, initial_tab_count))); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser->GetTabContentsAt(1))); - EXPECT_TRUE(IsLoginTab(browser->GetTabContentsAt(1))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser, 1))); + EXPECT_TRUE(IsLoginTab(chrome::GetTabContentsAt(browser, 1))); } else { portal_observer.WaitForResults(1); EXPECT_EQ(0, navigation_observer.num_navigations()); @@ -1110,7 +1111,7 @@ void CaptivePortalBrowserTest::SlowLoadBehindCaptivePortal( EXPECT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL, GetStateOfTabReloader( - browser->GetTabContentsAt(initial_active_index))); + chrome::GetTabContentsAt(browser, initial_active_index))); // Reset the load time to be large, so the timer won't trigger on a reload. SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromHours(1)); @@ -1121,12 +1122,12 @@ void CaptivePortalBrowserTest::FastTimeoutBehindCaptivePortal( bool expect_open_login_tab) { // Calling this on a tab that's waiting for a load to manually be timed out // will result in a hang. - ASSERT_FALSE(browser->GetActiveWebContents()->IsLoading()); + ASSERT_FALSE(chrome::GetActiveWebContents(browser)->IsLoading()); // Set the load time to be large, so the timer won't trigger. The value is // not restored at the end of the function. CaptivePortalTabReloader* tab_reloader = - GetTabReloader(browser->GetActiveTabContents()); + GetTabReloader(chrome::GetActiveTabContents(browser)); ASSERT_TRUE(tab_reloader); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromHours(1)); @@ -1137,7 +1138,7 @@ void CaptivePortalBrowserTest::FastTimeoutBehindCaptivePortal( int initial_loading_tabs = NumLoadingTabs(); int expected_broken_tabs = NumBrokenTabs(); if (CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL != - GetStateOfTabReloader(browser->GetActiveTabContents())) { + GetStateOfTabReloader(chrome::GetActiveTabContents(browser))) { ++expected_broken_tabs; } @@ -1158,12 +1159,12 @@ void CaptivePortalBrowserTest::FastTimeoutBehindCaptivePortal( // Make sure that the originally active tab and the captive portal tab have // each loaded once. EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser->GetWebContentsAt(initial_active_index))); + chrome::GetWebContentsAt(browser, initial_active_index))); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser->GetWebContentsAt(initial_tab_count))); + chrome::GetWebContentsAt(browser, initial_tab_count))); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser->GetTabContentsAt(1))); - EXPECT_TRUE(IsLoginTab(browser->GetTabContentsAt(1))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser, 1))); + EXPECT_TRUE(IsLoginTab(chrome::GetTabContentsAt(browser, 1))); } else { portal_observer.WaitForResults(1); navigation_observer.WaitForNavigations(1); @@ -1171,7 +1172,7 @@ void CaptivePortalBrowserTest::FastTimeoutBehindCaptivePortal( EXPECT_EQ(initial_active_index, browser->active_index()); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser->GetWebContentsAt(initial_active_index))); + chrome::GetWebContentsAt(browser, initial_active_index))); ASSERT_EQ(initial_tab_count, browser->tab_count()); EXPECT_EQ(initial_active_index, browser->active_index()); } @@ -1184,7 +1185,7 @@ void CaptivePortalBrowserTest::FastTimeoutBehindCaptivePortal( EXPECT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL, GetStateOfTabReloader( - browser->GetTabContentsAt(initial_active_index))); + chrome::GetTabContentsAt(browser, initial_active_index))); } void CaptivePortalBrowserTest::NavigateLoginTab(Browser* browser, @@ -1199,12 +1200,12 @@ void CaptivePortalBrowserTest::NavigateLoginTab(Browser* browser, int login_tab_index = browser->active_index(); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser->GetActiveTabContents())); - ASSERT_TRUE(IsLoginTab(browser->GetActiveTabContents())); + GetStateOfTabReloader(chrome::GetActiveTabContents(browser))); + ASSERT_TRUE(IsLoginTab(chrome::GetActiveTabContents(browser))); // Do the navigation. content::RenderViewHost* render_view_host = - browser->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser)->GetRenderViewHost(); render_view_host->ExecuteJavascriptInWebFrame( string16(), ASCIIToUTF16("submitForm()")); @@ -1223,12 +1224,13 @@ void CaptivePortalBrowserTest::NavigateLoginTab(Browser* browser, EXPECT_EQ(num_loading_tabs, NumLoadingTabs()); EXPECT_EQ(num_loading_tabs + num_timed_out_tabs, NumBrokenTabs()); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser->GetTabContentsAt(login_tab_index))); - EXPECT_TRUE(IsLoginTab(browser->GetTabContentsAt(login_tab_index))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser, + login_tab_index))); + EXPECT_TRUE(IsLoginTab(chrome::GetTabContentsAt(browser, login_tab_index))); // Make sure there were no unexpected navigations. EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser->GetWebContentsAt(login_tab_index))); + chrome::GetWebContentsAt(browser, login_tab_index))); } void CaptivePortalBrowserTest::Login(Browser* browser, @@ -1247,12 +1249,13 @@ void CaptivePortalBrowserTest::Login(Browser* browser, // Verify that the login page is on top. int login_tab_index = browser->active_index(); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser->GetTabContentsAt(login_tab_index))); - ASSERT_TRUE(IsLoginTab(browser->GetTabContentsAt(login_tab_index))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser, + login_tab_index))); + ASSERT_TRUE(IsLoginTab(chrome::GetTabContentsAt(browser, login_tab_index))); // Trigger a navigation. content::RenderViewHost* render_view_host = - browser->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser)->GetRenderViewHost(); render_view_host->ExecuteJavascriptInWebFrame( string16(), ASCIIToUTF16("submitForm()")); @@ -1274,11 +1277,11 @@ void CaptivePortalBrowserTest::Login(Browser* browser, EXPECT_EQ(initial_tab_count, browser->tab_count()); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, GetStateOfTabReloaderAt(browser, login_tab_index)); - EXPECT_FALSE(IsLoginTab(browser->GetTabContentsAt(login_tab_index))); + EXPECT_FALSE(IsLoginTab(chrome::GetTabContentsAt(browser, login_tab_index))); // Make sure there were no unexpected navigations of the login tab. EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser->GetWebContentsAt(login_tab_index))); + chrome::GetWebContentsAt(browser, login_tab_index))); } void CaptivePortalBrowserTest::FailLoadsAfterLogin(Browser* browser, @@ -1320,8 +1323,8 @@ void CaptivePortalBrowserTest::FailLoadsWithoutLogin(Browser* browser, int initial_num_tabs = browser->tab_count(); int login_tab = browser->active_index(); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser->GetActiveTabContents())); - ASSERT_TRUE(IsLoginTab(browser->GetActiveTabContents())); + GetStateOfTabReloader(chrome::GetActiveTabContents(browser))); + ASSERT_TRUE(IsLoginTab(chrome::GetActiveTabContents(browser))); CaptivePortalObserver portal_observer(browser->profile()); MultiNavigationObserver navigation_observer; @@ -1341,12 +1344,12 @@ void CaptivePortalBrowserTest::FailLoadsWithoutLogin(Browser* browser, EXPECT_EQ(0, NumLoadingTabs()); EXPECT_EQ(num_loading_tabs, NumBrokenTabs()); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser->GetActiveTabContents())); - EXPECT_TRUE(IsLoginTab(browser->GetActiveTabContents())); + GetStateOfTabReloader(chrome::GetActiveTabContents(browser))); + EXPECT_TRUE(IsLoginTab(chrome::GetActiveTabContents(browser))); EXPECT_EQ(login_tab, browser->active_index()); EXPECT_EQ(0, navigation_observer.NumNavigationsForTab( - browser->GetWebContentsAt(login_tab))); + chrome::GetWebContentsAt(browser, login_tab))); } void CaptivePortalBrowserTest::SetSlowSSLLoadTime( @@ -1491,7 +1494,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, LoginIncognito) { GetStateOfTabReloaderAt(browser(), 0)); EXPECT_EQ(0, navigation_observer.NumNavigationsForTab( - browser()->GetWebContentsAt(0))); + chrome::GetWebContentsAt(browser(), 0))); EXPECT_EQ(0, non_incognito_portal_observer.num_results_received()); } @@ -1516,12 +1519,12 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, LoginExtraNavigations) { FastTimeoutBehindCaptivePortal(browser(), true); // Activate the timed out tab and navigate it to a timeout again. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); FastTimeoutBehindCaptivePortal(browser(), false); // Activate and navigate the captive portal tab. This should not trigger a // reload of the tab with the error. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); NavigateLoginTab(browser(), 0, 1); // Simulate logging in. @@ -1567,19 +1570,19 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, TwoBrokenTabs) { EXPECT_EQ(1, NumLoadingTabs()); EXPECT_EQ(1, navigation_observer.num_navigations()); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser()->GetWebContentsAt(2))); + chrome::GetWebContentsAt(browser(), 2))); ASSERT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL, GetStateOfTabReloaderAt(browser(), 0)); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser()->GetTabContentsAt(1))); - ASSERT_TRUE(IsLoginTab(browser()->GetTabContentsAt(1))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser(), 1))); + ASSERT_TRUE(IsLoginTab(chrome::GetTabContentsAt(browser(), 1))); ASSERT_EQ(CaptivePortalTabReloader::STATE_NONE, GetStateOfTabReloaderAt(browser(), 2)); ASSERT_EQ(2, browser()->active_index()); SlowLoadBehindCaptivePortal(browser(), false); - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); Login(browser(), 2, 0); FailLoadsAfterLogin(browser(), 2); } @@ -1595,7 +1598,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, AbortLoad) { MultiNavigationObserver navigation_observer; // Switch back to the hung tab from the login tab, and abort the navigation. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); chrome::Stop(browser()); navigation_observer.WaitForNavigations(1); @@ -1605,7 +1608,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, AbortLoad) { EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, GetStateOfTabReloaderAt(browser(), 0)); - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); Login(browser(), 0, 0); } @@ -1617,7 +1620,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, NavigateBrokenTab) { FailLoadsWithoutLogin(browser(), 1); // Navigate the error tab to a non-error page. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ui_test_utils::NavigateToURL(browser(), URLRequestMockHTTPJob::GetMockUrl( FilePath(FILE_PATH_LITERAL("title2.html")))); @@ -1625,7 +1628,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, NavigateBrokenTab) { GetStateOfTabReloaderAt(browser(), 0)); // Simulate logging in. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); Login(browser(), 0, 0); } @@ -1641,7 +1644,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, URLRequestTimeoutOnDemandJob::AbandonJobs(1); CaptivePortalTabReloader* tab_reloader = - GetTabReloader(browser()->GetTabContentsAt(0)); + GetTabReloader(chrome::GetTabContentsAt(browser(), 0)); ASSERT_TRUE(tab_reloader); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta()); @@ -1651,7 +1654,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, // Navigate the error tab to another slow loading page. Can't have // ui_test_utils do the navigation because it will wait for loading tabs to // stop loading before navigating. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); browser()->OpenURL(content::OpenURLParams(GURL(kMockHttpsUrl), content::Referrer(), CURRENT_TAB, @@ -1664,14 +1667,14 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, EXPECT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL, GetStateOfTabReloaderAt(browser(), 0)); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser()->GetTabContentsAt(1))); - ASSERT_TRUE(IsLoginTab(browser()->GetTabContentsAt(1))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser(), 1))); + ASSERT_TRUE(IsLoginTab(chrome::GetTabContentsAt(browser(), 1))); // Need to make sure the request has been issued before logging in. URLRequestTimeoutOnDemandJob::WaitForJobs(1); // Simulate logging in. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromDays(1)); Login(browser(), 1, 0); @@ -1695,12 +1698,12 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBack) { MultiNavigationObserver navigation_observer; // Activate the error page tab again and go back. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); chrome::GoBack(browser(), CURRENT_TAB); navigation_observer.WaitForNavigations(1); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser()->GetWebContentsAt(0))); + chrome::GetWebContentsAt(browser(), 0))); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, GetStateOfTabReloaderAt(browser(), 0)); EXPECT_EQ(0, portal_observer.num_results_received()); @@ -1724,7 +1727,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) { EnableCaptivePortalDetection(browser()->profile(), true); CaptivePortalTabReloader* tab_reloader = - GetTabReloader(browser()->GetActiveTabContents()); + GetTabReloader(chrome::GetActiveTabContents(browser())); ASSERT_TRUE(tab_reloader); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta()); @@ -1745,15 +1748,15 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) { portal_observer.captive_portal_result()); ASSERT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL, - GetStateOfTabReloader(browser()->GetTabContentsAt(0))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser(), 0))); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser()->GetTabContentsAt(1))); - ASSERT_TRUE(IsLoginTab(browser()->GetTabContentsAt(1))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser(), 1))); + ASSERT_TRUE(IsLoginTab(chrome::GetTabContentsAt(browser(), 1))); ASSERT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->active_index()); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser()->GetWebContentsAt(1))); + chrome::GetWebContentsAt(browser(), 1))); EXPECT_EQ(1, NumLoadingTabs()); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromDays(1)); @@ -1777,12 +1780,12 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, ReloadTimeout) { URLRequestMockCaptivePortalJobFactory::SetBehindCaptivePortal(true); CaptivePortalTabReloader* tab_reloader = - GetTabReloader(browser()->GetActiveTabContents()); + GetTabReloader(chrome::GetActiveTabContents(browser())); ASSERT_TRUE(tab_reloader); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta()); MultiNavigationObserver navigation_observer; - browser()->GetActiveWebContents()->GetController().Reload(true); + chrome::GetActiveWebContents(browser())->GetController().Reload(true); // Wait for the login tab to open, and the two captive portal results from // opening an it. @@ -1797,15 +1800,15 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, ReloadTimeout) { portal_observer.captive_portal_result()); ASSERT_EQ(CaptivePortalTabReloader::STATE_BROKEN_BY_PORTAL, - GetStateOfTabReloader(browser()->GetTabContentsAt(0))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser(), 0))); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, - GetStateOfTabReloader(browser()->GetTabContentsAt(1))); - ASSERT_TRUE(IsLoginTab(browser()->GetTabContentsAt(1))); + GetStateOfTabReloader(chrome::GetTabContentsAt(browser(), 1))); + ASSERT_TRUE(IsLoginTab(chrome::GetTabContentsAt(browser(), 1))); ASSERT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->active_index()); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - browser()->GetWebContentsAt(1))); + chrome::GetWebContentsAt(browser(), 1))); EXPECT_EQ(1, NumLoadingTabs()); SetSlowSSLLoadTime(tab_reloader, base::TimeDelta::FromDays(1)); @@ -1862,9 +1865,9 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { // Check that the only two navigated tabs were the new error tab in the // backround windows, and the login tab in the active window. EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - inactive_browser->GetWebContentsAt(1))); + chrome::GetWebContentsAt(inactive_browser, 1))); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( - active_browser->GetWebContentsAt(1))); + chrome::GetWebContentsAt(active_browser, 1))); EXPECT_EQ(0, NumLoadingTabs()); // Check captive portal test results. @@ -1886,7 +1889,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, DISABLED_TwoWindows) { GetStateOfTabReloaderAt(active_browser, 0)); EXPECT_EQ(CaptivePortalTabReloader::STATE_NONE, GetStateOfTabReloaderAt(active_browser, 1)); - EXPECT_TRUE(IsLoginTab(active_browser->GetTabContentsAt(1))); + EXPECT_TRUE(IsLoginTab(chrome::GetTabContentsAt(active_browser, 1))); // Simulate logging in. Login(active_browser, 0, 1); diff --git a/chrome/browser/captive_portal/captive_portal_tab_helper.cc b/chrome/browser/captive_portal/captive_portal_tab_helper.cc index 485cb16..b754815 100644 --- a/chrome/browser/captive_portal/captive_portal_tab_helper.cc +++ b/chrome/browser/captive_portal/captive_portal_tab_helper.cc @@ -11,6 +11,7 @@ #include "chrome/browser/captive_portal/captive_portal_service_factory.h" #include "chrome/browser/ui/browser.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/common/chrome_notification_types.h" #include "content/public/browser/notification_details.h" @@ -160,15 +161,15 @@ void CaptivePortalTabHelper::OpenLoginTab() { // TODO(mmenke): Consider focusing that tab, at least if this is the tab // helper for the currently active tab for the profile. for (int i = 0; i < browser->tab_count(); ++i) { - TabContents* tab_contents = browser->GetTabContentsAt(i); + TabContents* tab_contents = chrome::GetTabContentsAt(browser, i); if (tab_contents->captive_portal_tab_helper()->IsLoginTab()) return; } // Otherwise, open a login tab. Only end up here when a captive portal result // was received, so it's safe to assume |profile_| has a CaptivePortalService. - TabContents* tab_contents = - browser->AddSelectedTabWithURL( + TabContents* tab_contents = chrome::AddSelectedTabWithURL( + browser, CaptivePortalServiceFactory::GetForProfile(profile_)->test_url(), content::PAGE_TRANSITION_TYPED); tab_contents->captive_portal_tab_helper()->SetIsLoginTab(); diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc index e20dc43..3ee6f63 100644 --- a/chrome/browser/chrome_main_browsertest.cc +++ b/chrome/browser/chrome_main_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -56,7 +57,7 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) { observer.Wait(); GURL url = net::FilePathToFileURL(test_file_path); - content::WebContents* tab = browser()->GetActiveWebContents(); + content::WebContents* tab = chrome::GetActiveWebContents(browser()); ASSERT_EQ(url, tab->GetController().GetActiveEntry()->GetVirtualURL()); } diff --git a/chrome/browser/chrome_switches_browsertest.cc b/chrome/browser/chrome_switches_browsertest.cc index 28aeafc..1e68680 100644 --- a/chrome/browser/chrome_switches_browsertest.cc +++ b/chrome/browser/chrome_switches_browsertest.cc @@ -4,6 +4,7 @@ #include "base/command_line.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -40,7 +41,7 @@ IN_PROC_BROWSER_TEST_F(HostRulesTest, TestMap) { std::string html; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.body.outerHTML);", &html)); diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc index 9e22c45..b724440 100644 --- a/chrome/browser/chrome_to_mobile_service.cc +++ b/chrome/browser/chrome_to_mobile_service.cc @@ -24,6 +24,7 @@ #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/cloud_print/cloud_print_helpers.h" @@ -249,7 +250,7 @@ void ChromeToMobileService::SendToMobile(const string16& mobile_id, DCHECK(!access_token_.empty()); RequestData data; data.mobile_id = mobile_id; - content::WebContents* web_contents = browser->GetActiveWebContents(); + content::WebContents* web_contents = chrome::GetActiveWebContents(browser); data.url = web_contents->GetURL(); data.title = web_contents->GetTitle(); data.snapshot_path = snapshot; @@ -337,9 +338,9 @@ void ChromeToMobileService::SnapshotFileCreated( snapshots_.insert(path); Browser* browser = browser::FindBrowserWithID(browser_id); - if (success && browser && browser->GetActiveWebContents()) { + if (success && browser && chrome::GetActiveWebContents(browser)) { // Generate the snapshot and have the observer be called back on completion. - browser->GetActiveWebContents()->GenerateMHTML(path, + chrome::GetActiveWebContents(browser)->GenerateMHTML(path, base::Bind(&Observer::SnapshotGenerated, observer)); } else if (observer.get()) { // Signal snapshot generation failure. diff --git a/chrome/browser/chromeos/boot_times_loader.cc b/chrome/browser/chromeos/boot_times_loader.cc index 508ba201..2137cd8 100644 --- a/chrome/browser/chromeos/boot_times_loader.cc +++ b/chrome/browser/chromeos/boot_times_loader.cc @@ -24,6 +24,7 @@ #include "chrome/browser/chromeos/login/authentication_notification_details.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/browser_thread.h" @@ -58,7 +59,7 @@ const std::string GetTabUrl(RenderWidgetHost* rwh) { ++it) { Browser* browser = *it; for (int i = 0, tab_count = browser->tab_count(); i < tab_count; ++i) { - WebContents* tab = browser->GetWebContentsAt(i); + WebContents* tab = chrome::GetWebContentsAt(browser, i); if (tab->GetRenderWidgetHostView() == rwhv) { return tab->GetURL().spec(); } diff --git a/chrome/browser/chromeos/enrollment_dialog_view.cc b/chrome/browser/chromeos/enrollment_dialog_view.cc index d2e9288..3ce38e9 100644 --- a/chrome/browser/chromeos/enrollment_dialog_view.cc +++ b/chrome/browser/chromeos/enrollment_dialog_view.cc @@ -10,6 +10,7 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "content/public/common/page_transition_types.h" #include "grit/generated_resources.h" @@ -114,9 +115,8 @@ bool EnrollmentDialogView::Accept() { browser = Browser::Create(profile_); } DCHECK(browser); - browser->AddSelectedTabWithURL( - target_uri_, - content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser, target_uri_, + content::PAGE_TRANSITION_LINK); return true; } diff --git a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc index bafb685..c3148dc 100644 --- a/chrome/browser/chromeos/extensions/file_browser_handler_api.cc +++ b/chrome/browser/chromeos/extensions/file_browser_handler_api.cc @@ -14,6 +14,7 @@ #include "chrome/browser/chromeos/extensions/file_manager_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/select_file_dialog.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -119,7 +120,7 @@ bool FileSelectorImpl::DoSelectFile(const FilePath& suggested_name, if (!browser->window()) return false; - TabContents* tab_contents = browser->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser); if (!tab_contents) return false; diff --git a/chrome/browser/chromeos/extensions/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_handler_util.cc index ade8746..975d9be 100644 --- a/chrome/browser/chromeos/extensions/file_handler_util.cc +++ b/chrome/browser/chromeos/extensions/file_handler_util.cc @@ -25,6 +25,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/extensions/file_browser_handler.h" #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" @@ -829,7 +830,7 @@ void ExtensionTaskExecutor::SetupPermissionsAndDispatchEvent( // Get tab id. Browser* current_browser = GetBrowser(); if (current_browser) { - WebContents* contents = current_browser->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(current_browser); if (contents) details->SetInteger("tab_id", ExtensionTabUtil::GetTabId(contents)); } diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc index 8571ad9..686b641 100644 --- a/chrome/browser/chromeos/extensions/file_manager_util.cc +++ b/chrome/browser/chromeos/extensions/file_manager_util.cc @@ -27,6 +27,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/simple_message_box.h" @@ -202,7 +203,7 @@ void OpenNewTab(const GURL& url, Profile* profile) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); Browser* browser = browser::FindOrCreateTabbedBrowser( profile ? profile : ProfileManager::GetDefaultProfileOrOffTheRecord()); - browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser, url, content::PAGE_TRANSITION_LINK); // If the current browser is not tabbed then the new tab will be created // in a different browser. Make sure it is visible. browser->window()->Show(); diff --git a/chrome/browser/chromeos/gdata/drive_task_executor.cc b/chrome/browser/chromeos/gdata/drive_task_executor.cc index 441b698..2f44ea1 100644 --- a/chrome/browser/chromeos/gdata/drive_task_executor.cc +++ b/chrome/browser/chromeos/gdata/drive_task_executor.cc @@ -17,6 +17,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "content/public/browser/browser_thread.h" #include "webkit/fileapi/file_system_types.h" @@ -149,7 +150,8 @@ void DriveTaskExecutor::OnAppAuthorized( } Browser* browser = GetBrowser(); - browser->AddSelectedTabWithURL(open_with_url, content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser, open_with_url, + content::PAGE_TRANSITION_LINK); // If the current browser is not tabbed then the new tab will be created // in a different browser. Make sure it is visible. browser->window()->Show(); diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc index bbdfbbf..7ff501e 100644 --- a/chrome/browser/chromeos/media/media_player.cc +++ b/chrome/browser/chromeos/media/media_player.cc @@ -13,6 +13,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/browser_thread.h" @@ -140,8 +141,8 @@ void MediaPlayer::PopupMediaPlayer() { chrome::NOTIFICATION_BROWSER_CLOSED, content::Source<Browser>(mediaplayer_browser_)); - mediaplayer_browser_->AddSelectedTabWithURL(GetMediaPlayerUrl(), - content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(mediaplayer_browser_, GetMediaPlayerUrl(), + content::PAGE_TRANSITION_LINK); mediaplayer_browser_->window()->Show(); } diff --git a/chrome/browser/chromeos/oom_priority_manager_browsertest.cc b/chrome/browser/chromeos/oom_priority_manager_browsertest.cc index a0abb6f..4d85eec 100644 --- a/chrome/browser/chromeos/oom_priority_manager_browsertest.cc +++ b/chrome/browser/chromeos/oom_priority_manager_browsertest.cc @@ -6,7 +6,9 @@ #include "chrome/browser/chromeos/oom_priority_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -79,22 +81,22 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { // and was not selected. EXPECT_TRUE(g_browser_process->oom_priority_manager()->DiscardTab()); EXPECT_EQ(3, browser()->tab_count()); - EXPECT_TRUE(browser()->IsTabDiscarded(0)); - EXPECT_FALSE(browser()->IsTabDiscarded(1)); - EXPECT_FALSE(browser()->IsTabDiscarded(2)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(0)); + EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(1)); + EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2)); // Run discard again, make sure it kills the second tab. g_browser_process->oom_priority_manager()->DiscardTab(); EXPECT_EQ(3, browser()->tab_count()); - EXPECT_TRUE(browser()->IsTabDiscarded(0)); - EXPECT_TRUE(browser()->IsTabDiscarded(1)); - EXPECT_FALSE(browser()->IsTabDiscarded(2)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(0)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1)); + EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2)); // Kill the third tab EXPECT_TRUE(g_browser_process->oom_priority_manager()->DiscardTab()); - EXPECT_TRUE(browser()->IsTabDiscarded(0)); - EXPECT_TRUE(browser()->IsTabDiscarded(1)); - EXPECT_TRUE(browser()->IsTabDiscarded(2)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(0)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(2)); // Running when all tabs are discarded should do nothing. EXPECT_FALSE(g_browser_process->oom_priority_manager()->DiscardTab()); @@ -110,11 +112,11 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { reload1.Wait(); // Make sure the FindBarController gets the right TabContents. EXPECT_EQ(browser()->GetFindBarController()->tab_contents(), - browser()->GetActiveTabContents()); + chrome::GetActiveTabContents(browser())); EXPECT_EQ(0, browser()->active_index()); - EXPECT_FALSE(browser()->IsTabDiscarded(0)); - EXPECT_TRUE(browser()->IsTabDiscarded(1)); - EXPECT_TRUE(browser()->IsTabDiscarded(2)); + EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(0)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(2)); // Select the third tab. It should reload. WindowedNotificationObserver reload2( @@ -123,9 +125,9 @@ IN_PROC_BROWSER_TEST_F(OomPriorityManagerTest, OomPriorityManagerBasics) { chrome::SelectNumberedTab(browser(), 2); reload2.Wait(); EXPECT_EQ(2, browser()->active_index()); - EXPECT_FALSE(browser()->IsTabDiscarded(0)); - EXPECT_TRUE(browser()->IsTabDiscarded(1)); - EXPECT_FALSE(browser()->IsTabDiscarded(2)); + EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(0)); + EXPECT_TRUE(browser()->tab_strip_model()->IsTabDiscarded(1)); + EXPECT_FALSE(browser()->tab_strip_model()->IsTabDiscarded(2)); // Navigate the third tab back twice. We used to crash here due to // crbug.com/121373. diff --git a/chrome/browser/collected_cookies_browsertest.cc b/chrome/browser/collected_cookies_browsertest.cc index 1a16508..217b9bf 100644 --- a/chrome/browser/collected_cookies_browsertest.cc +++ b/chrome/browser/collected_cookies_browsertest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -36,7 +37,7 @@ IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, DoubleDisplay) { browser(), test_server()->GetURL("files/cookie1.html")); // Click on the info link twice. - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); browser::ShowCollectedCookiesDialog(tab_contents); browser::ShowCollectedCookiesDialog(tab_contents); } @@ -53,7 +54,7 @@ IN_PROC_BROWSER_TEST_F(CollectedCookiesTest, NavigateAway) { browser(), test_server()->GetURL("files/cookie1.html")); // Click on the info link. - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); browser::ShowCollectedCookiesDialog(tab_contents); // Navigate to another page. diff --git a/chrome/browser/content_settings/content_settings_browsertest.cc b/chrome/browser/content_settings/content_settings_browsertest.cc index dd9551b..de18e2e 100644 --- a/chrome/browser/content_settings/content_settings_browsertest.cc +++ b/chrome/browser/content_settings/content_settings_browsertest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/content_settings/tab_specific_content_settings.h" #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/render_messages.h" #include "chrome/test/base/in_process_browser_test.h" @@ -31,7 +32,7 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, RedirectLoopCookies) { ui_test_utils::NavigateToURL(browser(), test_url); - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); ASSERT_EQ(UTF8ToUTF16(test_url.spec() + " failed to load"), tab_contents->web_contents()->GetTitle()); @@ -47,7 +48,7 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, ContentSettingsBlockDataURLs) { ui_test_utils::NavigateToURL(browser(), url); - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); ASSERT_EQ(UTF8ToUTF16("Data URL"), tab_contents->web_contents()->GetTitle()); EXPECT_TRUE(tab_contents->content_settings()->IsContentBlocked( @@ -72,7 +73,7 @@ IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, RedirectCrossOrigin) { ui_test_utils::NavigateToURL(browser(), test_url); - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); EXPECT_TRUE(tab_contents->content_settings()->IsContentBlocked( CONTENT_SETTINGS_TYPE_COOKIES)); @@ -109,10 +110,10 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, Basic) { string16 expected_title(ASCIIToUTF16("OK")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); content::RenderViewHost* host = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); host->Send(new ChromeViewMsg_LoadBlockedPlugins( host->GetRoutingID(), std::string())); @@ -130,20 +131,20 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, LoadAllBlockedPlugins) { string16 expected_title1(ASCIIToUTF16("1")); ui_test_utils::TitleWatcher title_watcher1( - browser()->GetActiveWebContents(), expected_title1); + chrome::GetActiveWebContents(browser()), expected_title1); content::RenderViewHost* host = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); host->Send(new ChromeViewMsg_LoadBlockedPlugins( host->GetRoutingID(), std::string())); EXPECT_EQ(expected_title1, title_watcher1.WaitAndGetTitle()); string16 expected_title2(ASCIIToUTF16("2")); ui_test_utils::TitleWatcher title_watcher2( - browser()->GetActiveWebContents(), expected_title2); + chrome::GetActiveWebContents(browser()), expected_title2); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.inject()")); EXPECT_EQ(expected_title2, title_watcher2.WaitAndGetTitle()); @@ -159,15 +160,15 @@ IN_PROC_BROWSER_TEST_F(ClickToPlayPluginTest, NoCallbackAtLoad) { // Inject the callback function into the HTML page generated by the browser. ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"CallOnStartup = function() { document.title = \"OK\"; }")); string16 expected_title(ASCIIToUTF16("OK")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); content::RenderViewHost* host = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); host->Send(new ChromeViewMsg_LoadBlockedPlugins( host->GetRoutingID(), std::string())); diff --git a/chrome/browser/crash_recovery_browsertest.cc b/chrome/browser/crash_recovery_browsertest.cc index 877c586..439c3ce 100644 --- a/chrome/browser/crash_recovery_browsertest.cc +++ b/chrome/browser/crash_recovery_browsertest.cc @@ -5,6 +5,7 @@ #include "base/file_path.h" #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/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -53,7 +54,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, Reload) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), @@ -82,7 +83,7 @@ IN_PROC_BROWSER_TEST_F(CrashRecoveryBrowserTest, LoadInNewTab) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); ASSERT_TRUE(ui_test_utils::GetCurrentTabTitle(browser(), diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc index bd8e6a7..f1096ce 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/navigation_controller.h" @@ -51,7 +52,7 @@ class RegisterProtocolHandlerBrowserTest : public InProcessBrowserTest { params.media_type = WebKit::WebContextMenuData::MediaTypeNone; params.link_url = url; params.unfiltered_link_url = url; - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); params.page_url = web_contents->GetController().GetActiveEntry()->GetURL(); #if defined(OS_MACOSX) params.writing_direction_default = 0; @@ -59,7 +60,7 @@ class RegisterProtocolHandlerBrowserTest : public InProcessBrowserTest { params.writing_direction_right_to_left = 0; #endif // OS_MACOSX TestRenderViewContextMenu* menu = new TestRenderViewContextMenu( - browser()->GetActiveWebContents(), params); + chrome::GetActiveWebContents(browser()), params); menu->Init(); return menu; } @@ -107,5 +108,5 @@ IN_PROC_BROWSER_TEST_F(RegisterProtocolHandlerBrowserTest, CustomHandler) { ui_test_utils::NavigateToURL(browser(), GURL("foo:test")); - ASSERT_EQ(handler_url, browser()->GetActiveWebContents()->GetURL()); + ASSERT_EQ(handler_url, chrome::GetActiveWebContents(browser())->GetURL()); } diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index 4e8f8b8..eea51be 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -12,6 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" @@ -181,7 +182,7 @@ void CustomHomePagesTableModel::SetToCurrentlyOpenPages() { continue; // Skip incognito browsers. for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) { - const GURL url = browser->GetWebContentsAt(tab_index)->GetURL(); + const GURL url = chrome::GetWebContentsAt(browser, tab_index)->GetURL(); if (ShouldAddPage(url)) Add(add_index++, url); } diff --git a/chrome/browser/debugger/devtools_sanity_browsertest.cc b/chrome/browser/debugger/devtools_sanity_browsertest.cc index 68551d1..aa5ffa6 100644 --- a/chrome/browser/debugger/devtools_sanity_browsertest.cc +++ b/chrome/browser/debugger/devtools_sanity_browsertest.cc @@ -17,6 +17,7 @@ #include "chrome/browser/profiles/profile.h" #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_notification_types.h" #include "chrome/common/chrome_paths.h" @@ -146,7 +147,7 @@ class DevToolsSanityTest : public InProcessBrowserTest { } WebContents* GetInspectedTab() { - return browser()->GetWebContentsAt(0); + return chrome::GetWebContentsAt(browser(), 0); } void CloseDevToolsWindow() { @@ -406,7 +407,7 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest { void CloseDevToolsWindow() { Browser* browser = window_->browser(); - browser->CloseAllTabs(); + chrome::CloseAllTabs(browser); BrowserClosedObserver close_observer(browser); } @@ -534,7 +535,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestReattachAfterCrash) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index 8b495aa..1743132 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -22,6 +22,7 @@ #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" #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/tabs/tab_strip_model.h" @@ -173,7 +174,7 @@ DevToolsWindow* DevToolsWindow::Create( bool shared_worker_frontend) { // Create TabContents with devtools. TabContents* tab_contents = - Browser::TabContentsFactory(profile, NULL, MSG_ROUTING_NONE, NULL, NULL); + chrome::TabContentsFactory(profile, NULL, MSG_ROUTING_NONE, NULL, NULL); tab_contents->web_contents()->GetRenderViewHost()->AllowBindings( content::BINDINGS_POLICY_WEB_UI); tab_contents->web_contents()->GetController().LoadURL( @@ -257,7 +258,7 @@ void DevToolsWindow::InspectedContentsClosing() { // for us. Browser* browser = browser_; delete this; - browser->CloseAllTabs(); + chrome::CloseAllTabs(browser); } } @@ -388,11 +389,9 @@ bool DevToolsWindow::FindInspectedBrowserAndTabIndex(Browser** browser, if (!inspected_tab_) return false; - const NavigationController& controller = - inspected_tab_->web_contents()->GetController(); for (BrowserList::const_iterator it = BrowserList::begin(); it != BrowserList::end(); ++it) { - int tab_index = (*it)->GetIndexOfController(&controller); + int tab_index = chrome::GetIndexOfTab(*it, inspected_tab_->web_contents()); if (tab_index != TabStripModel::kNoTab) { *browser = *it; *tab = tab_index; diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index b619551..6a10e10 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -32,6 +32,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_switch_utils.h" @@ -220,7 +221,7 @@ WebContents* ChromeDownloadManagerDelegate:: // Start the download in the last active browser. This is not ideal but better // than fully hiding the download from the user. Browser* last_active = browser::FindLastActiveWithProfile(profile_); - return last_active ? last_active->GetActiveWebContents() : NULL; + return last_active ? chrome::GetActiveWebContents(last_active) : NULL; #endif } diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index a47277a..9de4e2c 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -39,6 +39,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #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/chrome_pages.h" #include "chrome/common/chrome_notification_types.h" @@ -651,7 +652,7 @@ class DownloadTest : public InProcessBrowserTest { ASSERT_TRUE(url.is_valid()) << s.str(); DownloadManager* download_manager = DownloadManagerForBrowser(browser()); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents) << s.str(); scoped_ptr<DownloadTestObserver> observer( @@ -960,7 +961,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadResourceThrottleCancels) { EXPECT_TRUE(EnsureNoPendingDownloads()); // Disable downloads for the tab. - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); DownloadRequestLimiter::TabDownloadState* tab_download_state = g_browser_process->download_request_limiter()->GetDownloadState( web_contents, web_contents, true); @@ -977,7 +978,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadResourceThrottleCancels) { 1); bool download_assempted; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(startDownload());", &download_assempted)); @@ -1038,8 +1039,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, PerWindowShelf) { // Open a second tab and wait. EXPECT_NE(static_cast<TabContents*>(NULL), - browser()->AddSelectedTabWithURL( - GURL(), content::PAGE_TRANSITION_TYPED)); + chrome::AddSelectedTabWithURL(browser(), GURL(), + content::PAGE_TRANSITION_TYPED)); EXPECT_EQ(2, browser()->tab_count()); EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible()); @@ -1048,7 +1049,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, PerWindowShelf) { EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible()); // Go to the first tab. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); EXPECT_EQ(2, browser()->tab_count()); // The download shelf should not be visible. @@ -1554,7 +1555,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, ChromeURLAfterDownload) { ui_test_utils::NavigateToURL(browser(), flags_url); DownloadAndWait(browser(), download_url, EXPECT_NO_SELECT_DIALOG); ui_test_utils::NavigateToURL(browser(), extensions_url); - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(contents); bool webui_responded = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( @@ -1574,7 +1575,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, BrowserCloseAfterDownload) { GURL download_url(URLRequestMockHTTPJob::GetMockUrl(file)); ui_test_utils::NavigateToURL(browser(), downloads_url); - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(contents); bool result = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( @@ -1934,7 +1935,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrl) { // DownloadUrl always prompts; return acceptance of whatever it prompts. NullSelectFile(browser()); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents); DownloadTestObserver* observer( @@ -1962,7 +1963,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadUrlToPath) { FilePath file(FILE_PATH_LITERAL("download-test1.lib")); GURL url(URLRequestMockHTTPJob::GetMockUrl(file)); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents); ScopedTempDir other_directory; @@ -2032,7 +2033,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaGet) { context_menu_params.media_type = WebKit::WebContextMenuData::MediaTypeImage; context_menu_params.src_url = url; context_menu_params.page_url = url; - TestRenderViewContextMenu menu(browser()->GetActiveWebContents(), + TestRenderViewContextMenu menu(chrome::GetActiveWebContents(browser()), context_menu_params); menu.Init(); menu.ExecuteCommand(IDC_CONTENT_CONTEXT_SAVEIMAGEAS); @@ -2069,7 +2070,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SavePageNonHTMLViaPost) { // which normally requires revalidation each time. GURL jpeg_url = test_server()->GetURL("files/post/downloads/image.jpg"); ASSERT_TRUE(jpeg_url.is_valid()); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents != NULL); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, @@ -2429,7 +2430,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, LoadURLExternallyReferrerPolicy) { // Click on the link with the alt key pressed. This will download the link // target. - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); WebKit::WebMouseEvent mouse_event; mouse_event.type = WebKit::WebInputEvent::MouseDown; mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc index 0f77fb9..4cd180a 100644 --- a/chrome/browser/download/download_danger_prompt_browsertest.cc +++ b/chrome/browser/download/download_danger_prompt_browsertest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/download/download_danger_prompt.h" #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/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -83,7 +84,7 @@ class DownloadDangerPromptTest : public InProcessBrowserTest { void CreatePrompt() { prompt_ = DownloadDangerPrompt::Create( &download_, - browser()->GetActiveTabContents(), + chrome::GetActiveTabContents(browser()), base::Bind(&DownloadDangerPromptTest::PromptCallback, this, DownloadDangerPrompt::ACCEPT), base::Bind(&DownloadDangerPromptTest::PromptCallback, this, diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index e0d79b4..66e2843 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -22,6 +22,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -100,7 +101,7 @@ class SavePageBrowserTest : public InProcessBrowserTest { } WebContents* GetCurrentTab() const { - WebContents* current_tab = browser()->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser()); EXPECT_TRUE(current_tab); return current_tab; } diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index 54c4622..1b8a54f 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/net/url_request_mock_util.h" #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/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -39,7 +40,7 @@ class ErrorPageTest : public InProcessBrowserTest { const std::string& expected_title, int num_navigations) { ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), + chrome::GetActiveWebContents(browser()), ASCIIToUTF16(expected_title)); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( @@ -85,12 +86,12 @@ class ErrorPageTest : public InProcessBrowserTest { int num_navigations, HistoryNavigationDirection direction) { ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), + chrome::GetActiveWebContents(browser()), ASCIIToUTF16(expected_title)); content::TestNavigationObserver test_navigation_observer( content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController()), + &chrome::GetActiveWebContents(browser())->GetController()), NULL, num_navigations); if (direction == HISTORY_NAVIGATE_BACK) { diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc index e5cd52c..909c3ca 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc @@ -23,6 +23,7 @@ #include "chrome/browser/prefs/pref_service.h" #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" @@ -552,7 +553,8 @@ class DownloadExtensionTest : public ExtensionApiTest { void SetUpExtensionFunction(UIThreadExtensionFunction* function) { if (extension_) { // Recreate the tab each time for insulation. - TabContents* tab = current_browser()->AddSelectedTabWithURL( + TabContents* tab = chrome::AddSelectedTabWithURL( + current_browser(), extension_->GetResourceURL("empty.html"), content::PAGE_TRANSITION_LINK); function->set_extension(extension_); 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 d110b04..c0902ee 100644 --- a/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/browser_action_apitest.cc @@ -16,6 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_action.h" @@ -81,7 +82,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) { service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL); // Verify the command worked. - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); bool result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( tab->GetRenderViewHost(), L"", @@ -147,7 +148,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, EXPECT_EQ("hi!", GetBrowserActionsBar().GetTooltip(0)); // Go back to first tab, changed title should reappear. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); EXPECT_EQ("Showing icon 2", GetBrowserActionsBar().GetTooltip(0)); // Reload that tab, default title should come back. @@ -197,7 +198,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionAddPopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); ExtensionAction* browser_action = extension->browser_action(); ASSERT_TRUE(browser_action) @@ -252,7 +254,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionRemovePopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); ExtensionAction* browser_action = extension->browser_action(); ASSERT_TRUE(browser_action) 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 921b8d3..79ffce8 100644 --- a/chrome/browser/extensions/api/extension_action/page_action_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/page_action_apitest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/restore_tab_helper.h" #include "chrome/browser/ui/browser.h" +#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" @@ -33,8 +34,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) { } // Test that we received the changes. - int tab_id = browser()->GetActiveTabContents()-> - restore_tab_helper()->session_id().id(); + int tab_id = chrome::GetActiveTabContents(browser())->restore_tab_helper()-> + session_id().id(); ExtensionAction* action = extension->page_action(); ASSERT_TRUE(action); EXPECT_EQ("Modified", action->GetTitle(tab_id)); @@ -43,7 +44,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) { // Simulate the page action being clicked. ResultCatcher catcher; int tab_id = - ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser())); ExtensionService* service = browser()->profile()->GetExtensionService(); service->browser_event_router()->PageActionExecuted( browser()->profile(), *action, tab_id, "", 0); @@ -59,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) { } // Test that we received the changes. - tab_id = browser()->GetActiveTabContents()->restore_tab_helper()-> + tab_id = chrome::GetActiveTabContents(browser())->restore_tab_helper()-> session_id().id(); EXPECT_FALSE(action->GetIcon(tab_id).isNull()); } @@ -71,7 +72,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageActionAddPopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); ExtensionAction* page_action = extension->page_action(); ASSERT_TRUE(page_action) @@ -117,7 +119,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageActionRemovePopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); ExtensionAction* page_action = extension->page_action(); ASSERT_TRUE(page_action) @@ -158,7 +161,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OldPageActions) { { ResultCatcher catcher; int tab_id = - ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser())); ExtensionService* service = browser()->profile()->GetExtensionService(); service->browser_event_router()->PageActionExecuted( browser()->profile(), *extension->page_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 afb8ca1..a96e5c0 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 @@ -12,6 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/restore_tab_helper.h" #include "chrome/browser/ui/browser.h" +#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" @@ -72,7 +73,8 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) { } // Test that we received the changes. - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); ExtensionAction* action = extension->browser_action(); ASSERT_TRUE(action); EXPECT_EQ("Modified", action->GetTitle(tab_id)); @@ -104,7 +106,8 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, AddPopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); ExtensionAction* page_action = extension->browser_action(); ASSERT_TRUE(page_action) @@ -149,7 +152,8 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, RemovePopup) { const Extension* extension = GetSingleLoadedExtension(); ASSERT_TRUE(extension) << message_; - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); ExtensionAction* page_action = extension->browser_action(); ASSERT_TRUE(page_action) 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 c63db57..5f0c95e 100644 --- a/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc +++ b/chrome/browser/extensions/api/extension_action/script_badge_apitest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/extensions/extension_tab_helper.h" #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/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" @@ -24,7 +25,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ScriptBadge) { const ExtensionAction* script_badge = extension->script_badge(); ASSERT_TRUE(script_badge); - const int tab_id = browser()->GetActiveTabContents()-> + const int tab_id = chrome::GetActiveTabContents(browser())-> extension_tab_helper()->tab_id(); EXPECT_EQ(GURL(extension->GetResourceURL("default_popup.html")), script_badge->GetPopupUrl(tab_id)); diff --git a/chrome/browser/extensions/api/tabs/tabs.cc b/chrome/browser/extensions/api/tabs/tabs.cc index 2910088..d370bc1 100644 --- a/chrome/browser/extensions/api/tabs/tabs.cc +++ b/chrome/browser/extensions/api/tabs/tabs.cc @@ -38,6 +38,7 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/browser/ui/panels/panel_manager.h" @@ -625,8 +626,8 @@ bool CreateWindowFunction::RunImpl() { extension_id); for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) { - TabContents* tab = new_window->AddSelectedTabWithURL( - *i, content::PAGE_TRANSITION_LINK); + TabContents* tab = chrome::AddSelectedTabWithURL( + new_window, *i, content::PAGE_TRANSITION_LINK); if (window_type == Browser::TYPE_PANEL) tab->extension_tab_helper()->SetExtensionAppIconById(extension_id); } @@ -1400,7 +1401,7 @@ bool MoveTabsFunction::RunImpl() { return false; // Don't let the extension move the tab if the user is dragging tabs. - if (!source_browser->IsTabStripEditable()) { + if (!chrome::IsTabStripEditable(source_browser)) { error_ = keys::kTabStripNotEditableError; return false; } @@ -1417,7 +1418,7 @@ bool MoveTabsFunction::RunImpl() { if (!GetBrowserFromWindowID(this, window_id, &target_browser)) return false; - if (!target_browser->IsTabStripEditable()) { + if (!chrome::IsTabStripEditable(target_browser)) { error_ = keys::kTabStripNotEditableError; return false; } @@ -1561,14 +1562,14 @@ bool RemoveTabsFunction::RunImpl() { return false; // Don't let the extension remove a tab if the user is dragging tabs around. - if (!browser->IsTabStripEditable()) { + if (!chrome::IsTabStripEditable(browser)) { error_ = keys::kTabStripNotEditableError; return false; } // There's a chance that the tab is being dragged, or we're in some other // nested event loop. This code path ensures that the tab is safely closed - // under such circumstances, whereas |Browser::CloseTabContents()| does not. + // under such circumstances, whereas |chrome::CloseWebContents()| does not. contents->web_contents()->Close(); } return true; @@ -1586,13 +1587,13 @@ bool CaptureVisibleTabFunction::GetTabToCapture( if (!GetBrowserFromWindowID(this, window_id, &browser)) return false; - *web_contents = browser->GetActiveWebContents(); + *web_contents = chrome::GetActiveWebContents(browser); if (*web_contents == NULL) { error_ = keys::kInternalVisibleTabCaptureError; return false; } - *tab_contents = browser->GetActiveTabContents(); + *tab_contents = chrome::GetActiveTabContents(browser); return true; }; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc index 1ebf8bb..4d6e396 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_view_host.h" @@ -183,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationUserAction) { ASSERT_TRUE( RunExtensionSubtest("webnavigation", "test_userAction.html")) << message_; - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::WaitForLoadStop(tab); ResultCatcher catcher; @@ -221,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationRequestOpenTab) { ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_requestOpenTab.html")) << message_; - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::WaitForLoadStop(tab); ResultCatcher catcher; @@ -258,7 +259,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationTargetBlank) { ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_targetBlank.html")) << message_; - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::WaitForLoadStop(tab); ResultCatcher catcher; @@ -302,9 +303,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, WebNavigationTargetBlankIncognito) { "files/extensions/api_test/webnavigation/targetBlank/a.html"); ui_test_utils::OpenURLOffTheRecord(browser()->profile(), url); - WebContents* tab = browser::FindTabbedBrowser( - browser()->profile()->GetOffTheRecordProfile(), false)-> - GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser::FindTabbedBrowser( + browser()->profile()->GetOffTheRecordProfile(), false)); // There's a link with target=_blank on a.html. Click on it to open it in a // new tab. diff --git a/chrome/browser/extensions/api/web_request/web_request_apitest.cc b/chrome/browser/extensions/api/web_request/web_request_apitest.cc index f5c6df2..3203e23 100644 --- a/chrome/browser/extensions/api/web_request/web_request_apitest.cc +++ b/chrome/browser/extensions/api/web_request/web_request_apitest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/login/login_prompt.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" @@ -99,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) { ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html")) << message_; - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::WaitForLoadStop(tab); ResultCatcher catcher; diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc index 5436de3..fdc73a7 100644 --- a/chrome/browser/extensions/app_process_apitest.cc +++ b/chrome/browser/extensions/app_process_apitest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #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" @@ -81,8 +82,8 @@ class AppApiTest : public ExtensionApiTest { ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); LOG(INFO) << "Nav 1."; EXPECT_TRUE(process_map->Contains( - browser()->GetWebContentsAt(1)->GetRenderProcessHost()->GetID())); - EXPECT_FALSE(browser()->GetWebContentsAt(1)->GetWebUI()); + chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID())); + EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 1)->GetWebUI()); ui_test_utils::WindowedNotificationObserver tab_added_observer( chrome::NOTIFICATION_TAB_ADDED, @@ -94,16 +95,16 @@ class AppApiTest : public ExtensionApiTest { base_url.Resolve("path2/empty.html")); LOG(INFO) << "Nav 2."; EXPECT_TRUE(process_map->Contains( - browser()->GetWebContentsAt(2)->GetRenderProcessHost()->GetID())); - EXPECT_FALSE(browser()->GetWebContentsAt(2)->GetWebUI()); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()->GetID())); + EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 2)->GetWebUI()); // We should have opened 2 new extension tabs. Including the original blank // tab, we now have 3 tabs. The two app tabs should not be in the same // process, since they do not have the background permission. (Thus, we // want to separate them to improve responsiveness.) ASSERT_EQ(3, browser()->tab_count()); - WebContents* tab1 = browser()->GetWebContentsAt(1); - WebContents* tab2 = browser()->GetWebContentsAt(2); + WebContents* tab1 = chrome::GetWebContentsAt(browser(), 1); + WebContents* tab2 = chrome::GetWebContentsAt(browser(), 2); EXPECT_NE(tab1->GetRenderProcessHost(), tab2->GetRenderProcessHost()); // Opening tabs with window.open should keep the page in the opener's @@ -141,16 +142,16 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) { browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); EXPECT_TRUE(process_map->Contains( - browser()->GetWebContentsAt(1)->GetRenderProcessHost()->GetID())); - EXPECT_FALSE(browser()->GetWebContentsAt(1)->GetWebUI()); + chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID())); + EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 1)->GetWebUI()); LOG(INFO) << "Nav 1."; ui_test_utils::NavigateToURLWithDisposition( browser(), base_url.Resolve("path2/empty.html"), NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); EXPECT_TRUE(process_map->Contains( - browser()->GetWebContentsAt(2)->GetRenderProcessHost()->GetID())); - EXPECT_FALSE(browser()->GetWebContentsAt(2)->GetWebUI()); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()->GetID())); + EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 2)->GetWebUI()); LOG(INFO) << "Nav 2."; ui_test_utils::WindowedNotificationObserver tab_added_observer( @@ -162,20 +163,20 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) { ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path3/empty.html")); LOG(INFO) << "Nav 3."; EXPECT_FALSE(process_map->Contains( - browser()->GetWebContentsAt(3)->GetRenderProcessHost()->GetID())); - EXPECT_FALSE(browser()->GetWebContentsAt(3)->GetWebUI()); + chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost()->GetID())); + EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 3)->GetWebUI()); // We should have opened 3 new extension tabs. Including the original blank // tab, we now have 4 tabs. Because the app_process app has the background // permission, all of its instances are in the same process. Thus two tabs // should be part of the extension app and grouped in the same process. ASSERT_EQ(4, browser()->tab_count()); - WebContents* tab = browser()->GetWebContentsAt(1); + WebContents* tab = chrome::GetWebContentsAt(browser(), 1); EXPECT_EQ(tab->GetRenderProcessHost(), - browser()->GetWebContentsAt(2)->GetRenderProcessHost()); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()); EXPECT_NE(tab->GetRenderProcessHost(), - browser()->GetWebContentsAt(3)->GetRenderProcessHost()); + chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost()); // Now let's do the same using window.open. The same should happen. ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile())); @@ -195,24 +196,24 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) { // extent. They should switch processes. const GURL& app_url(base_url.Resolve("path1/empty.html")); const GURL& non_app_url(base_url.Resolve("path3/empty.html")); - NavigateInRenderer(browser()->GetWebContentsAt(2), non_app_url); + NavigateInRenderer(chrome::GetWebContentsAt(browser(), 2), non_app_url); LOG(INFO) << "NavigateTabHelper 1."; - NavigateInRenderer(browser()->GetWebContentsAt(3), app_url); + NavigateInRenderer(chrome::GetWebContentsAt(browser(), 3), app_url); LOG(INFO) << "NavigateTabHelper 2."; EXPECT_NE(tab->GetRenderProcessHost(), - browser()->GetWebContentsAt(2)->GetRenderProcessHost()); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()); EXPECT_EQ(tab->GetRenderProcessHost(), - browser()->GetWebContentsAt(3)->GetRenderProcessHost()); + chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost()); // If one of the popup tabs navigates back to the app, window.opener should // be valid. - NavigateInRenderer(browser()->GetWebContentsAt(6), app_url); + NavigateInRenderer(chrome::GetWebContentsAt(browser(), 6), app_url); LOG(INFO) << "NavigateTabHelper 3."; EXPECT_EQ(tab->GetRenderProcessHost(), - browser()->GetWebContentsAt(6)->GetRenderProcessHost()); + chrome::GetWebContentsAt(browser(), 6)->GetRenderProcessHost()); bool windowOpenerValid = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetWebContentsAt(6)->GetRenderViewHost(), L"", + chrome::GetWebContentsAt(browser(), 6)->GetRenderViewHost(), L"", L"window.domAutomationController.send(window.opener != null)", &windowOpenerValid)); ASSERT_TRUE(windowOpenerValid); @@ -262,8 +263,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, BookmarkAppGetsNormalProcess) { browser(), base_url.Resolve("path1/empty.html"), NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); EXPECT_FALSE(process_map->Contains( - browser()->GetWebContentsAt(1)->GetRenderProcessHost()->GetID())); - EXPECT_FALSE(browser()->GetWebContentsAt(1)->GetWebUI()); + chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID())); + EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 1)->GetWebUI()); ui_test_utils::WindowedNotificationObserver tab_added_observer( chrome::NOTIFICATION_TAB_ADDED, @@ -272,16 +273,16 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, BookmarkAppGetsNormalProcess) { tab_added_observer.Wait(); ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path2/empty.html")); EXPECT_FALSE(process_map->Contains( - browser()->GetWebContentsAt(2)->GetRenderProcessHost()->GetID())); - EXPECT_FALSE(browser()->GetWebContentsAt(2)->GetWebUI()); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()->GetID())); + EXPECT_FALSE(chrome::GetWebContentsAt(browser(), 2)->GetWebUI()); // We should have opened 2 new bookmark app tabs. Including the original blank // tab, we now have 3 tabs. Because normal pages use the // process-per-site-instance model, each should be in its own process. ASSERT_EQ(3, browser()->tab_count()); - WebContents* tab = browser()->GetWebContentsAt(1); + WebContents* tab = chrome::GetWebContentsAt(browser(), 1); EXPECT_NE(tab->GetRenderProcessHost(), - browser()->GetWebContentsAt(2)->GetRenderProcessHost()); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()); // Now let's do the same using window.open. The same should happen. ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile())); @@ -292,13 +293,14 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, BookmarkAppGetsNormalProcess) { // extent. Neither navigation should switch processes. const GURL& app_url(base_url.Resolve("path1/empty.html")); const GURL& non_app_url(base_url.Resolve("path3/empty.html")); - RenderViewHost* host2 = browser()->GetWebContentsAt(2)->GetRenderViewHost(); - NavigateInRenderer(browser()->GetWebContentsAt(2), non_app_url); + RenderViewHost* host2 = + chrome::GetWebContentsAt(browser(), 2)->GetRenderViewHost(); + NavigateInRenderer(chrome::GetWebContentsAt(browser(), 2), non_app_url); EXPECT_EQ(host2->GetProcess(), - browser()->GetWebContentsAt(2)->GetRenderProcessHost()); - NavigateInRenderer(browser()->GetWebContentsAt(2), app_url); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()); + NavigateInRenderer(chrome::GetWebContentsAt(browser(), 2), app_url); EXPECT_EQ(host2->GetProcess(), - browser()->GetWebContentsAt(2)->GetRenderProcessHost()); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()); } // Tests that app process switching works properly in the following scenario: @@ -336,10 +338,10 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) { // process. ASSERT_EQ(3, browser()->tab_count()); EXPECT_EQ("/files/extensions/api_test/app_process/path1/empty.html", - browser()->GetWebContentsAt(2)->GetController(). + chrome::GetWebContentsAt(browser(), 2)->GetController(). GetLastCommittedEntry()->GetURL().path()); - EXPECT_EQ(browser()->GetWebContentsAt(1)->GetRenderProcessHost(), - browser()->GetWebContentsAt(2)->GetRenderProcessHost()); + EXPECT_EQ(chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost(), + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()); } // Ensure that reloading a URL after installing or uninstalling it as an app @@ -364,7 +366,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) { // Load an app URL before loading the app. ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html")); - WebContents* contents = browser()->GetWebContentsAt(0); + WebContents* contents = chrome::GetWebContentsAt(browser(), 0); EXPECT_FALSE(process_map->Contains( contents->GetRenderProcessHost()->GetID())); @@ -387,7 +389,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) { ui_test_utils::WindowedNotificationObserver reload_observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); reload_observer.Wait(); EXPECT_TRUE(process_map->Contains( @@ -398,7 +400,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) { ui_test_utils::WindowedNotificationObserver reload_observer2( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); reload_observer2.Wait(); EXPECT_FALSE(process_map->Contains( @@ -409,7 +411,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) { ui_test_utils::WindowedNotificationObserver js_reload_observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(), L"", L"location.reload();")); js_reload_observer.Wait(); @@ -421,7 +423,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) { ui_test_utils::WindowedNotificationObserver js_reload_observer2( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(contents->GetRenderViewHost(), L"", L"location = location;")); js_reload_observer2.Wait(); @@ -454,7 +456,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromIframe) { ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path3/container.html")); EXPECT_FALSE(process_map->Contains( - browser()->GetWebContentsAt(0)->GetRenderProcessHost()->GetID())); + chrome::GetWebContentsAt(browser(), 0)->GetRenderProcessHost()->GetID())); popup_observer.Wait(); // Popup window should be in the app's process. @@ -499,7 +501,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromExtension) { // App has loaded, and chrome.app.isInstalled should be true. bool is_installed = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(chrome.app.isInstalled)", &is_installed)); ASSERT_TRUE(is_installed); @@ -532,7 +534,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenWebPopupFromWebIframe) { ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/container.html")); content::RenderProcessHost* process = - browser()->GetWebContentsAt(0)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 0)->GetRenderProcessHost(); EXPECT_TRUE(process_map->Contains(process->GetID())); // Wait for popup window to appear. @@ -563,7 +565,7 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) { // Load the app, chrome.app.isInstalled should be true. ui_test_utils::NavigateToURL(browser(), base_url.Resolve("path1/empty.html")); - WebContents* contents = browser()->GetWebContentsAt(0); + WebContents* contents = chrome::GetWebContentsAt(browser(), 0); EXPECT_TRUE(process_map->Contains( contents->GetRenderProcessHost()->GetID())); bool is_installed = false; @@ -574,11 +576,11 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) { ASSERT_TRUE(is_installed); // Crash the tab and reload it, chrome.app.isInstalled should still be true. - ui_test_utils::CrashTab(browser()->GetActiveWebContents()); + ui_test_utils::CrashTab(chrome::GetActiveWebContents(browser())); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc index fed11d3..a476f51 100644 --- a/chrome/browser/extensions/browser_action_apitest.cc +++ b/chrome/browser/extensions/browser_action_apitest.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/ui/browser_tabstrip.h" + // Tests that tooltips of a browser action icon can be specified using UTF8. // See http://crbug.com/25349. IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) { @@ -18,7 +20,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationBrowserAction) { extension->description().c_str()); EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur is my name").c_str(), extension->name().c_str()); - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur").c_str(), extension->browser_action()->GetTitle(tab_id).c_str()); } diff --git a/chrome/browser/extensions/browser_extension_window_controller.cc b/chrome/browser/extensions/browser_extension_window_controller.cc index a22ac72..66aca07 100644 --- a/chrome/browser/extensions/browser_extension_window_controller.cc +++ b/chrome/browser/extensions/browser_extension_window_controller.cc @@ -9,6 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/extensions/extension.h" @@ -52,7 +53,7 @@ BrowserExtensionWindowController::CreateWindowValueWithTabs() const { bool BrowserExtensionWindowController::CanClose(Reason* reason) const { // Don't let an extension remove the window if the user is dragging tabs // in that window. - if (!browser_->IsTabStripEditable()) { + if (!chrome::IsTabStripEditable(browser_)) { *reason = ExtensionWindowController::REASON_NOT_EDITABLE; return false; } diff --git a/chrome/browser/extensions/chrome_app_api_browsertest.cc b/chrome/browser/extensions/chrome_app_api_browsertest.cc index 0374221..6ca7f9f 100644 --- a/chrome/browser/extensions/chrome_app_api_browsertest.cc +++ b/chrome/browser/extensions/chrome_app_api_browsertest.cc @@ -13,6 +13,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/manifest.h" @@ -32,7 +33,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest { bool result; CHECK( ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), frame_xpath, get_app_is_installed, &result)); return result; } @@ -45,7 +46,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest { std::string result; CHECK( ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), frame_xpath, get_app_install_state, &result)); return result; } @@ -58,7 +59,7 @@ class ChromeAppAPITest : public ExtensionBrowserTest { std::string result; CHECK( ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), frame_xpath, get_app_install_state, &result)); return result; } @@ -112,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { std::string result; ASSERT_TRUE( ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", get_app_details, &result)); EXPECT_EQ("null", result); @@ -125,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { ui_test_utils::NavigateToURL(browser(), app_url); ASSERT_TRUE( ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", get_app_details, &result)); scoped_ptr<DictionaryValue> app_details( static_cast<DictionaryValue*>(base::JSONReader::Read(result))); @@ -138,7 +139,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, IsInstalled) { // that isInstalled should have the initial value. ASSERT_TRUE( ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(" L" function() {" @@ -189,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) { bool result = false; ASSERT_TRUE( ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", test_unsuccessful_access, &result)); EXPECT_TRUE(result); @@ -202,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(ChromeAppAPITest, GetDetailsForFrame) { std::string json; ASSERT_TRUE( ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", get_details_for_frame, &json)); scoped_ptr<DictionaryValue> app_details( diff --git a/chrome/browser/extensions/content_script_apitest.cc b/chrome/browser/extensions/content_script_apitest.cc index cfc699f..1997f04 100644 --- a/chrome/browser/extensions/content_script_apitest.cc +++ b/chrome/browser/extensions/content_script_apitest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" @@ -103,7 +104,7 @@ IN_PROC_BROWSER_TEST_F( // And check that its styles were affected by the styles that just got loaded. bool styles_injected; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(" L"document.defaultView.getComputedStyle(document.body, null)." L"getPropertyValue('background-color') == 'rgb(255, 0, 0)')", diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index 91ba6dc..021c1ee 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -15,6 +15,7 @@ #include "chrome/browser/extensions/extension_window_controller.h" #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" @@ -97,7 +98,8 @@ void ExtensionBrowserEventRouter::Init() { Browser* browser = *iter; if (browser->tab_strip_model()) { for (int i = 0; i < browser->tab_strip_model()->count(); ++i) { - WebContents* contents = browser->GetTabContentsAt(i)->web_contents(); + WebContents* contents = + chrome::GetTabContentsAt(browser, i)->web_contents(); int tab_id = ExtensionTabUtil::GetTabId(contents); tab_entries_[tab_id] = TabEntry(); } @@ -143,7 +145,7 @@ void ExtensionBrowserEventRouter::RegisterForBrowserNotifications( for (int i = 0; i < browser->tab_strip_model()->count(); ++i) { RegisterForTabNotifications( - browser->GetTabContentsAt(i)->web_contents()); + chrome::GetTabContentsAt(browser, i)->web_contents()); } } diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index bfcded4..0338d11 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -15,6 +15,7 @@ #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/common/context_menu_params.h" @@ -143,7 +144,7 @@ class ExtensionContextMenuBrowserTest : public ExtensionBrowserTest { const GURL& page_url, const GURL& link_url, const GURL& frame_url) { - WebContents* web_contents = browser->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser); WebContextMenuData data; content::ContextMenuParams params(data); params.page_url = page_url; diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 09d69df..b6a76ed 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -12,6 +12,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/extensions/extension.h" @@ -74,7 +75,7 @@ bool ExtensionContextMenuModel::IsCommandIdEnabled(int command_id) const { // homepage, we just disable this menu item. return extension->GetHomepageURL().is_valid(); } else if (command_id == INSPECT_POPUP) { - TabContents* tab_contents = browser_->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser_); if (!tab_contents) return false; diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc index 4bc39f2..21e0d9a 100644 --- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc +++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc @@ -17,6 +17,7 @@ #include "chrome/browser/profiles/profile.h" #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" @@ -176,7 +177,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ReloadIndependently) { SCOPED_TRACE("after reloading"); CheckExtensionConsistency(first_extension_id_); - WebContents* current_tab = browser()->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(current_tab); // The balloon should automatically hide after the extension is successfully @@ -191,13 +192,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, CrashExtension(first_extension_id_); ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); - WebContents* original_tab = browser()->GetActiveWebContents(); + WebContents* original_tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(original_tab); ASSERT_EQ(1U, CountBalloons()); // Open a new tab, but the balloon will still be there. chrome::NewTab(browser()); - WebContents* new_current_tab = browser()->GetActiveWebContents(); + WebContents* new_current_tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(new_current_tab); ASSERT_NE(new_current_tab, original_tab); ASSERT_EQ(1U, CountBalloons()); @@ -219,7 +220,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, CrashExtension(first_extension_id_); ASSERT_EQ(size_before, GetExtensionService()->extensions()->size()); - WebContents* current_tab = browser()->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(current_tab); ASSERT_EQ(1U, CountBalloons()); @@ -392,7 +393,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, { SCOPED_TRACE("first: reload"); - WebContents* current_tab = browser()->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(current_tab); // At the beginning we should have one balloon displayed for each extension. ASSERT_EQ(2U, CountBalloons()); @@ -485,7 +486,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrashRecoveryTest, ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); } diff --git a/chrome/browser/extensions/extension_devtools_browsertests.cc b/chrome/browser/extensions/extension_devtools_browsertests.cc index 2c14017..bdf26b4 100644 --- a/chrome/browser/extensions/extension_devtools_browsertests.cc +++ b/chrome/browser/extensions/extension_devtools_browsertests.cc @@ -13,6 +13,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" @@ -69,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, TimelineApi) { DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); // Grab the tab_id of whatever tab happens to be first. - WebContents* web_contents = browser()->GetWebContentsAt(0); + WebContents* web_contents = chrome::GetWebContentsAt(browser(), 0); ASSERT_TRUE(web_contents); int tab_id = ExtensionTabUtil::GetTabId(web_contents); @@ -128,7 +129,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, ProcessRefCounting) { DevToolsManager* devtools_manager = DevToolsManager::GetInstance(); // Grab the tab_id of whatever tab happens to be first. - WebContents* web_contents = browser()->GetWebContentsAt(0); + WebContents* web_contents = chrome::GetWebContentsAt(browser(), 0); ASSERT_TRUE(web_contents); int tab_id = ExtensionTabUtil::GetTabId(web_contents); diff --git a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc index 8e1cbd8..65ff97b 100644 --- a/chrome/browser/extensions/extension_dom_clipboard_apitest.cc +++ b/chrome/browser/extensions/extension_dom_clipboard_apitest.cc @@ -5,6 +5,7 @@ #include "base/stringprintf.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" @@ -66,7 +67,7 @@ bool ClipboardApiTest::ExecutePasteInSelectedTab(bool* result) { bool ClipboardApiTest::ExecuteScriptInSelectedTab(const std::wstring& script, bool* result) { if (!ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", script, result)) { diff --git a/chrome/browser/extensions/extension_icon_source_apitest.cc b/chrome/browser/extensions/extension_icon_source_apitest.cc index 64f38182..8c7f002 100644 --- a/chrome/browser/extensions/extension_icon_source_apitest.cc +++ b/chrome/browser/extensions/extension_icon_source_apitest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -34,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) { browser(), GURL("chrome-extension://gbmgkahjioeacddebbnengilkgbkhodg/index.html")); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Loaded"); @@ -45,7 +46,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoaded) { browser(), GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html")); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Not Loaded"); @@ -67,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) { Browser* otr_browser = browser::FindTabbedBrowser( browser()->profile()->GetOffTheRecordProfile(), false); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - otr_browser->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Loaded"); @@ -78,7 +79,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionIconSourceTest, IconsLoadedIncognito) { browser()->profile(), GURL("chrome-extension://apocjbpjpkghdepdngjlknfpmabcmlao/index.html")); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - otr_browser->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(otr_browser)->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Not Loaded"); diff --git a/chrome/browser/extensions/extension_incognito_apitest.cc b/chrome/browser/extensions/extension_incognito_apitest.cc index bee0332..0cdd2da 100644 --- a/chrome/browser/extensions/extension_incognito_apitest.cc +++ b/chrome/browser/extensions/extension_incognito_apitest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" @@ -33,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoNoScript) { Browser* otr_browser = browser::FindTabbedBrowser( browser()->profile()->GetOffTheRecordProfile(), false); - WebContents* tab = otr_browser->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(otr_browser); // Verify the script didn't run. bool result = false; @@ -70,7 +71,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoYesScript) { Browser* otr_browser = browser::FindTabbedBrowser( browser()->profile()->GetOffTheRecordProfile(), false); - WebContents* tab = otr_browser->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(otr_browser); // Verify the script ran. bool result = false; diff --git a/chrome/browser/extensions/extension_install_ui_browsertest.cc b/chrome/browser/extensions/extension_install_ui_browsertest.cc index 41a8672..00a36d2 100644 --- a/chrome/browser/extensions/extension_install_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_install_ui_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.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 "chrome/browser/themes/theme_service_factory.h" @@ -24,7 +25,7 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest { // Checks that a theme info bar is currently visible and issues an undo to // revert to the previous theme. void VerifyThemeInfoBarAndUndoInstall() { - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(tab); InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper(); ASSERT_EQ(1U, infobar_helper->infobar_count()); @@ -50,7 +51,7 @@ class ExtensionInstallUIBrowserTest : public ExtensionBrowserTest { IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, MAYBE_TestThemeInstallUndoResetsToDefault) { - ui_test_utils::CloseAllInfoBars(browser()->GetActiveTabContents()); + ui_test_utils::CloseAllInfoBars(chrome::GetActiveTabContents(browser())); // Install theme once and undo to verify we go back to default theme. FilePath theme_crx = PackExtension(test_data_dir_.AppendASCII("theme")); @@ -79,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, TestThemeInstallUndoResetsToPreviousTheme) { - ui_test_utils::CloseAllInfoBars(browser()->GetActiveTabContents()); + ui_test_utils::CloseAllInfoBars(chrome::GetActiveTabContents(browser())); // Install first theme. FilePath theme_path = test_data_dir_.AppendASCII("theme"); @@ -109,7 +110,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, if (NewTabUI::ShouldShowApps()) { EXPECT_EQ(num_tabs + 1, browser()->tab_count()); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents); EXPECT_TRUE(StartsWithASCII(web_contents->GetURL().spec(), "chrome://newtab/", false)); @@ -134,7 +135,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionInstallUIBrowserTest, EXPECT_EQ(num_incognito_tabs, incognito_browser->tab_count()); if (NewTabUI::ShouldShowApps()) { EXPECT_EQ(num_normal_tabs + 1, browser()->tab_count()); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents); EXPECT_TRUE(StartsWithASCII(web_contents->GetURL().spec(), "chrome://newtab/", false)); diff --git a/chrome/browser/extensions/extension_install_ui_default.cc b/chrome/browser/extensions/extension_install_ui_default.cc index 1841c05..e40ef17 100644 --- a/chrome/browser/extensions/extension_install_ui_default.cc +++ b/chrome/browser/extensions/extension_install_ui_default.cc @@ -17,6 +17,7 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/simple_message_box.h" #include "chrome/browser/ui/singleton_tabs.h" @@ -149,7 +150,7 @@ void ExtensionInstallUIDefault::OnInstallFailure( return; Browser* browser = browser::FindLastActiveWithProfile(browser_->profile()); - TabContents* tab_contents = browser->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser); if (!tab_contents) return; InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper(); @@ -177,7 +178,7 @@ void ExtensionInstallUIDefault::ShowThemeInfoBar( if (!browser) return; - TabContents* tab_contents = browser->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser); if (!tab_contents) return; InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper(); diff --git a/chrome/browser/extensions/extension_keybinding_apitest.cc b/chrome/browser/extensions/extension_keybinding_apitest.cc index 49509d7..be52988 100644 --- a/chrome/browser/extensions/extension_keybinding_apitest.cc +++ b/chrome/browser/extensions/extension_keybinding_apitest.cc @@ -6,6 +6,7 @@ #include "chrome/browser/extensions/browser_action_test_util.h" #include "chrome/browser/sessions/restore_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/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" @@ -60,7 +61,7 @@ IN_PROC_BROWSER_TEST_F(KeybindingApiTest, Basic) { browser(), ui::VKEY_F, true, true, false, false)); // Verify the command worked. - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); bool result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( tab->GetRenderViewHost(), L"", @@ -101,8 +102,8 @@ IN_PROC_BROWSER_TEST_F(KeybindingApiTest, PageAction) { // Make sure it appears and is the right one. ASSERT_TRUE(WaitForPageActionVisibilityChangeTo(1)); - int tab_id = browser()->GetActiveTabContents()-> - restore_tab_helper()->session_id().id(); + int tab_id = chrome::GetActiveTabContents(browser())->restore_tab_helper()-> + session_id().id(); ExtensionAction* action = extension->page_action(); ASSERT_TRUE(action); EXPECT_EQ("Make this page red", action->GetTitle(tab_id)); @@ -112,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(KeybindingApiTest, PageAction) { browser(), ui::VKEY_F, true, true, false, false)); // Verify the command worked (the page action turns the page red). - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); bool result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( tab->GetRenderViewHost(), L"", diff --git a/chrome/browser/extensions/extension_nacl_browsertest.cc b/chrome/browser/extensions/extension_nacl_browsertest.cc index 8b564ce5..48db269 100644 --- a/chrome/browser/extensions/extension_nacl_browsertest.cc +++ b/chrome/browser/extensions/extension_nacl_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -99,7 +100,7 @@ class NaClExtensionTest : public ExtensionBrowserTest { bool embedded_plugin_created = false; bool content_handler_plugin_created = false; - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( web_contents->GetRenderViewHost(), L"", L"window.domAutomationController.send(EmbeddedPluginCreated());", diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc index 722d894..e6aab12 100644 --- a/chrome/browser/extensions/extension_override_apitest.cc +++ b/chrome/browser/extensions/extension_override_apitest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/navigation_entry.h" @@ -52,7 +53,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, OverrideNewtab) { // Navigate to the new tab page. The overridden new tab page // will call chrome.test.notifyPass() . ui_test_utils::NavigateToURL(browser(), GURL("chrome://newtab/")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(tab->GetController().GetActiveEntry()); EXPECT_TRUE(tab->GetController().GetActiveEntry()->GetURL(). SchemeIs(chrome::kExtensionScheme)); @@ -79,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionOverrideTest, MAYBE_OverrideNewtabIncognito) { GURL("chrome://newtab/")); Browser* otr_browser = browser::FindTabbedBrowser( browser()->profile()->GetOffTheRecordProfile(), false); - WebContents* tab = otr_browser->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(otr_browser); ASSERT_TRUE(tab->GetController().GetActiveEntry()); EXPECT_FALSE(tab->GetController().GetActiveEntry()->GetURL(). SchemeIs(chrome::kExtensionScheme)); diff --git a/chrome/browser/extensions/extension_process_manager.cc b/chrome/browser/extensions/extension_process_manager.cc index 0bc296c..54cca76 100644 --- a/chrome/browser/extensions/extension_process_manager.cc +++ b/chrome/browser/extensions/extension_process_manager.cc @@ -18,6 +18,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" @@ -297,7 +298,7 @@ void ExtensionProcessManager::OpenOptionsPage(const Extension* extension, content::PAGE_TRANSITION_LINK, false); browser->OpenURL(params); browser->window()->Show(); - WebContents* web_contents = browser->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser); web_contents->GetDelegate()->ActivateContents(web_contents); } diff --git a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc index 6ac2078..763701a 100644 --- a/chrome/browser/extensions/extension_resource_request_policy_apitest.cc +++ b/chrome/browser/extensions/extension_resource_request_policy_apitest.cc @@ -5,6 +5,7 @@ #include "base/logging.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -47,7 +48,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { browser(), web_resource.ReplaceComponents(make_host_a_com)); std::string result; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Loaded"); @@ -59,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { "non_existent_extension.html")); ui_test_utils::NavigateToURL(browser(), non_existent_extension); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Image failed to load"); @@ -73,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { ui_test_utils::NavigateToURL(browser(), GURL(std::string("data:text/html;charset=utf-8,") + file_source)); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Loaded"); @@ -87,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, OriginPrivileges) { browser(), GURL("chrome-extension://pbkkcbgdkliohhfaeefcijaghglkahja/index.html")); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ(result, "Loaded"); @@ -143,7 +144,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/accessible_resource.html")); ui_test_utils::NavigateToURL(browser(), accessible_resource); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ("Loaded", result); @@ -155,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, ui_test_utils::NavigateToURL( browser(), xhr_accessible_resource); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ("XHR completed with status: 200", result); @@ -167,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, ui_test_utils::NavigateToURL( browser(), xhr_inaccessible_resource); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ("XHR failed to load resource", result); @@ -178,7 +179,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/nonaccessible_resource.html")); ui_test_utils::NavigateToURL(browser(), nonaccessible_resource); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ("Image failed to load", result); @@ -189,7 +190,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/nonexistent_resource.html")); ui_test_utils::NavigateToURL(browser(), nonexistent_resource); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ("Image failed to load", result); @@ -200,7 +201,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, "web_accessible/nonaccessible_chrome_resource_scheme.html")); ui_test_utils::NavigateToURL(browser(), nonaccessible_cer_resource); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title)", &result)); EXPECT_EQ("Loading CER:// failed.", result); diff --git a/chrome/browser/extensions/extension_startup_browsertest.cc b/chrome/browser/extensions/extension_startup_browsertest.cc index f78c609..09e1a69 100644 --- a/chrome/browser/extensions/extension_startup_browsertest.cc +++ b/chrome/browser/extensions/extension_startup_browsertest.cc @@ -13,6 +13,7 @@ #include "chrome/browser/extensions/user_script_master.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -117,7 +118,7 @@ class ExtensionStartupTestBase : public InProcessBrowserTest { bool result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(" L"document.defaultView.getComputedStyle(document.body, null)." L"getPropertyValue('background-color') == 'rgb(245, 245, 220)')", @@ -126,7 +127,7 @@ class ExtensionStartupTestBase : public InProcessBrowserTest { result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.title == 'Modified')", &result)); EXPECT_EQ(expect_script, result); diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 9473401..86a265e 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -11,6 +11,7 @@ #include "chrome/browser/sessions/restore_tab_helper.h" #include "chrome/browser/ui/browser.h" #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/tabs/tab_strip_model.h" @@ -155,7 +156,7 @@ bool ExtensionTabUtil::GetDefaultTab(Browser* browser, DCHECK(browser); DCHECK(contents); - *contents = browser->GetActiveTabContents(); + *contents = chrome::GetActiveTabContents(browser); if (*contents) { if (tab_id) *tab_id = ExtensionTabUtil::GetTabId((*contents)->web_contents()); diff --git a/chrome/browser/extensions/extension_toolbar_model.cc b/chrome/browser/extensions/extension_toolbar_model.cc index f8289ac..cb54f40 100644 --- a/chrome/browser/extensions/extension_toolbar_model.cc +++ b/chrome/browser/extensions/extension_toolbar_model.cc @@ -12,6 +12,7 @@ #include "chrome/browser/prefs/pref_service.h" #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/extensions/extension.h" @@ -88,7 +89,7 @@ ExtensionToolbarModel::Action ExtensionToolbarModel::ExecuteBrowserAction( const Extension* extension, Browser* browser, GURL* popup_url_out) { - TabContents* tab_contents = browser->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser); if (!tab_contents) return ACTION_NONE; diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc index 3283be0..cfbabd8 100644 --- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc +++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc @@ -7,6 +7,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser.h" +#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/omnibox/omnibox_view.h" @@ -33,7 +34,7 @@ class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest { } content::NavigationController* GetNavigationController() const { - return &browser()->GetActiveWebContents()->GetController(); + return &chrome::GetActiveWebContents(browser())->GetController(); } NavigationEntry* GetNavigationEntry() const { diff --git a/chrome/browser/extensions/isolated_app_browsertest.cc b/chrome/browser/extensions/isolated_app_browsertest.cc index 46d0637..d3f5de5 100644 --- a/chrome/browser/extensions/isolated_app_browsertest.cc +++ b/chrome/browser/extensions/isolated_app_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #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" @@ -88,9 +89,9 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CookieIsolation) { ASSERT_EQ(3, browser()->tab_count()); // Ensure first two tabs have installed apps. - WebContents* tab1 = browser()->GetWebContentsAt(0); - WebContents* tab2 = browser()->GetWebContentsAt(1); - WebContents* tab3 = browser()->GetWebContentsAt(2); + WebContents* tab1 = chrome::GetWebContentsAt(browser(), 0); + WebContents* tab2 = chrome::GetWebContentsAt(browser(), 1); + WebContents* tab3 = chrome::GetWebContentsAt(browser(), 2); ASSERT_TRUE(GetInstalledApp(tab1)); ASSERT_TRUE(GetInstalledApp(tab2)); ASSERT_TRUE(!GetInstalledApp(tab3)); @@ -124,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, CookieIsolation) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); EXPECT_TRUE(HasCookie(tab1, "app1=3")); @@ -159,15 +160,15 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, NoCookieIsolationWithoutApp) { ASSERT_EQ(3, browser()->tab_count()); // Check that tabs see each others' cookies. - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(0), "app2=4")); - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(0), "normalPage=5")); - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(0), "nonAppFrame=6")); - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(1), "app1=3")); - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(1), "normalPage=5")); - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(1), "nonAppFrame=6")); - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(2), "app1=3")); - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(2), "app2=4")); - EXPECT_TRUE(HasCookie(browser()->GetWebContentsAt(2), "nonAppFrame=6")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 0), "app2=4")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 0), "normalPage=5")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 0), "nonAppFrame=6")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 1), "app1=3")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 1), "normalPage=5")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 1), "nonAppFrame=6")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 2), "app1=3")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 2), "app2=4")); + EXPECT_TRUE(HasCookie(chrome::GetWebContentsAt(browser(), 2), "nonAppFrame=6")); } // Tests that isolated apps processes do not render top-level non-app pages. @@ -196,31 +197,31 @@ IN_PROC_BROWSER_TEST_F(IsolatedAppTest, IsolatedAppProcessModel) { browser(), base_url.Resolve("app1/main.html"), NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); // For the third tab, use window.open to keep it in process with an opener. - OpenWindow(browser()->GetWebContentsAt(0), + OpenWindow(chrome::GetWebContentsAt(browser(), 0), base_url.Resolve("app1/main.html"), true, NULL); // In a fourth tab, use window.open to a non-app URL. It should open in a // separate process, even though this would trigger the OAuth workaround // for hosted apps (from http://crbug.com/59285). - OpenWindow(browser()->GetWebContentsAt(0), + OpenWindow(chrome::GetWebContentsAt(browser(), 0), base_url.Resolve("non_app/main.html"), false, NULL); // We should now have four tabs, the first and third sharing a process. // The second one is an independent instance in a separate process. ASSERT_EQ(4, browser()->tab_count()); int process_id_0 = - browser()->GetWebContentsAt(0)->GetRenderProcessHost()->GetID(); + chrome::GetWebContentsAt(browser(), 0)->GetRenderProcessHost()->GetID(); int process_id_1 = - browser()->GetWebContentsAt(1)->GetRenderProcessHost()->GetID(); + chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID(); EXPECT_NE(process_id_0, process_id_1); EXPECT_EQ(process_id_0, - browser()->GetWebContentsAt(2)->GetRenderProcessHost()->GetID()); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost()->GetID()); EXPECT_NE(process_id_0, - browser()->GetWebContentsAt(3)->GetRenderProcessHost()->GetID()); + chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost()->GetID()); // Navigating the second tab out of the app should cause a process swap. const GURL& non_app_url(base_url.Resolve("non_app/main.html")); - NavigateInRenderer(browser()->GetWebContentsAt(1), non_app_url); + NavigateInRenderer(chrome::GetWebContentsAt(browser(), 1), non_app_url); EXPECT_NE(process_id_1, - browser()->GetWebContentsAt(1)->GetRenderProcessHost()->GetID()); + chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost()->GetID()); } diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc index 5441af6..5a54454 100644 --- a/chrome/browser/extensions/lazy_background_page_apitest.cc +++ b/chrome/browser/extensions/lazy_background_page_apitest.cc @@ -16,6 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/chrome_notification_types.h" @@ -111,7 +112,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, BrowserActionCreateTab) { EXPECT_FALSE(pm->GetBackgroundHostForExtension(last_loaded_extension_id_)); EXPECT_EQ(num_tabs_before + 1, browser()->tab_count()); EXPECT_EQ("chrome://chrome/extensions/", - browser()->GetActiveWebContents()->GetURL().spec()); + chrome::GetActiveWebContents(browser())->GetURL().spec()); } IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, @@ -192,7 +193,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForView) { // The extension should've opened a new tab to an extension page. EXPECT_EQ(extension->GetResourceURL("extension_page.html").spec(), - browser()->GetActiveWebContents()->GetURL().spec()); + chrome::GetActiveWebContents(browser())->GetURL().spec()); // Lazy Background Page still exists, because the extension created a new tab // to an extension page. @@ -201,7 +202,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, WaitForView) { EXPECT_TRUE(pm->GetBackgroundHostForExtension(last_loaded_extension_id_)); // Close the new tab. - browser()->CloseTabContents(browser()->GetActiveWebContents()); + chrome::CloseWebContents(browser(), chrome::GetActiveWebContents(browser())); page_complete.Wait(); // Lazy Background Page has been shut down. diff --git a/chrome/browser/extensions/options_page_apitest.cc b/chrome/browser/extensions/options_page_apitest.cc index c281ac2..a3e5282 100644 --- a/chrome/browser/extensions/options_page_apitest.cc +++ b/chrome/browser/extensions/options_page_apitest.cc @@ -5,6 +5,7 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_service.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" @@ -38,7 +39,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, DISABLED_OptionsPage) { ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIExtensionsURL)); TabStripModel* tab_strip = browser()->tab_strip_model(); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", jscript_click_option_button)); // If the options page hasn't already come up, wait for it. diff --git a/chrome/browser/extensions/page_action_browsertest.cc b/chrome/browser/extensions/page_action_browsertest.cc index 90e7e9c..e7fba44 100644 --- a/chrome/browser/extensions/page_action_browsertest.cc +++ b/chrome/browser/extensions/page_action_browsertest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" @@ -186,7 +187,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, TitleLocalizationPageAction) { extension->description().c_str()); EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur is my name").c_str(), extension->name().c_str()); - int tab_id = ExtensionTabUtil::GetTabId(browser()->GetActiveWebContents()); + int tab_id = ExtensionTabUtil::GetTabId( + chrome::GetActiveWebContents(browser())); EXPECT_STREQ(WideToUTF8(L"Hreggvi\u00F0ur").c_str(), extension->page_action()->GetTitle(tab_id).c_str()); } diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc index 3faa89f..49f83f1 100644 --- a/chrome/browser/extensions/platform_app_browsertest.cc +++ b/chrome/browser/extensions/platform_app_browsertest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/extensions/platform_app_browsertest_util.h" #include "chrome/browser/extensions/shell_window_registry.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/extensions/shell_window.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/ui_test_utils.h" @@ -145,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, Isolation) { std::string cookie_value; automation_util::GetCookies( set_cookie_url, - browser()->GetWebContentsAt(0), + chrome::GetWebContentsAt(browser(), 0), &cookie_size, &cookie_value); ASSERT_EQ("testCookie=1", cookie_value); diff --git a/chrome/browser/extensions/plugin_apitest.cc b/chrome/browser/extensions/plugin_apitest.cc index 524abbd..4987eca 100644 --- a/chrome/browser/extensions/plugin_apitest.cc +++ b/chrome/browser/extensions/plugin_apitest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/prefs/pref_service.h" #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" @@ -38,7 +39,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(extension_dir.AppendASCII("test.html"))); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); // With no extensions, the plugin should not be loaded. bool result = false; @@ -80,7 +81,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, MAYBE_PluginLoadUnload) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); } @@ -112,7 +113,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, PluginPrivate) { // Load the test page through the extension URL, and the plugin should work. ui_test_utils::NavigateToURL(browser(), extension->GetResourceURL("test.html")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); bool result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( tab->GetRenderViewHost(), L"", L"testPluginWorks()", &result)); diff --git a/chrome/browser/extensions/process_management_browsertest.cc b/chrome/browser/extensions/process_management_browsertest.cc index 048792c..c037a78 100644 --- a/chrome/browser/extensions/process_management_browsertest.cc +++ b/chrome/browser/extensions/process_management_browsertest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/profiles/profile.h" #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" @@ -109,25 +110,25 @@ IN_PROC_BROWSER_TEST_F(ProcessManagementTest, ProcessOverflow) { // Get tab processes. ASSERT_EQ(9, browser()->tab_count()); content::RenderProcessHost* isolated1_host = - browser()->GetWebContentsAt(0)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 0)->GetRenderProcessHost(); content::RenderProcessHost* ntp1_host = - browser()->GetWebContentsAt(1)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost(); content::RenderProcessHost* hosted1_host = - browser()->GetWebContentsAt(2)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost(); content::RenderProcessHost* web1_host = - browser()->GetWebContentsAt(3)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost(); content::RenderProcessHost* isolated2_host = - browser()->GetWebContentsAt(4)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 4)->GetRenderProcessHost(); content::RenderProcessHost* ntp2_host = - browser()->GetWebContentsAt(5)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 5)->GetRenderProcessHost(); content::RenderProcessHost* hosted2_host = - browser()->GetWebContentsAt(6)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 6)->GetRenderProcessHost(); content::RenderProcessHost* web2_host = - browser()->GetWebContentsAt(7)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 7)->GetRenderProcessHost(); content::RenderProcessHost* second_isolated1_host = - browser()->GetWebContentsAt(8)->GetRenderProcessHost(); + chrome::GetWebContentsAt(browser(), 8)->GetRenderProcessHost(); // Get extension processes. ExtensionProcessManager* process_manager = diff --git a/chrome/browser/extensions/subscribe_page_action_browsertest.cc b/chrome/browser/extensions/subscribe_page_action_browsertest.cc index 454742d..18fdd0c 100644 --- a/chrome/browser/extensions/subscribe_page_action_browsertest.cc +++ b/chrome/browser/extensions/subscribe_page_action_browsertest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" @@ -111,7 +112,7 @@ void NavigateToFeedAndValidate(net::TestServer* server, ui_test_utils::NavigateToURL(browser, GetFeedUrl(server, url, true, extension_id)); - WebContents* tab = browser->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser); ASSERT_TRUE(ValidatePageElement(tab, L"", jscript_feed_title, diff --git a/chrome/browser/extensions/web_contents_browsertest.cc b/chrome/browser/extensions/web_contents_browsertest.cc index 031c1f7..e9420c6 100644 --- a/chrome/browser/extensions/web_contents_browsertest.cc +++ b/chrome/browser/extensions/web_contents_browsertest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/ui_test_utils.h" // Tests that we can load extension pages into the tab area and they can call @@ -20,7 +21,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) { bool result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"testTabsAPI()", &result)); EXPECT_TRUE(result); @@ -32,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WebContents) { GURL("chrome-extension://behllobkkfkfnphdnhnkndlbkcpglgmj/page.html")); result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"testTabsAPI()", &result)); EXPECT_TRUE(result); } diff --git a/chrome/browser/extensions/webstore_inline_install_browsertest.cc b/chrome/browser/extensions/webstore_inline_install_browsertest.cc index 0570a9b..62256fe 100644 --- a/chrome/browser/extensions/webstore_inline_install_browsertest.cc +++ b/chrome/browser/extensions/webstore_inline_install_browsertest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/webstore_inline_installer.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" @@ -77,7 +78,7 @@ class WebstoreInlineInstallTest : public InProcessBrowserTest { std::string script = StringPrintf("%s('%s')", test_function_name.c_str(), test_gallery_url_.c_str()); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", UTF8ToWide(script), &result)); EXPECT_TRUE(result); } @@ -142,7 +143,7 @@ IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, InstallNotSupported) { if (browser()->tab_strip_model()->count() == 1) { ui_test_utils::WaitForNewTab(browser()); } - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); EXPECT_EQ(GURL("http://cws.com/show-me-the-money"), web_contents->GetURL()); } diff --git a/chrome/browser/extensions/window_open_apitest.cc b/chrome/browser/extensions/window_open_apitest.cc index 749b853..96e10e6 100644 --- a/chrome/browser/extensions/window_open_apitest.cc +++ b/chrome/browser/extensions/window_open_apitest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/base/ui_test_utils.h" @@ -263,7 +264,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) { last_loaded_extension_id_ + "/test.html"); ui_test_utils::NavigateToURL(browser(), start_url); WebContents* newtab; - ASSERT_NO_FATAL_FAILURE(OpenWindow(browser()->GetActiveWebContents(), + ASSERT_NO_FATAL_FAILURE(OpenWindow(chrome::GetActiveWebContents(browser()), start_url.Resolve("newtab.html"), true, &newtab)); bool result = false; @@ -281,7 +282,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenInvalidExtension) { GURL start_url(std::string("chrome-extension://") + last_loaded_extension_id_ + "/test.html"); ui_test_utils::NavigateToURL(browser(), start_url); - ASSERT_NO_FATAL_FAILURE(OpenWindow(browser()->GetActiveWebContents(), + ASSERT_NO_FATAL_FAILURE(OpenWindow(chrome::GetActiveWebContents(browser()), GURL("chrome-extension://thisissurelynotavalidextensionid/newtab.html"), false, NULL)); @@ -298,7 +299,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) { ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); WebContents* newtab; - ASSERT_NO_FATAL_FAILURE(OpenWindow(browser()->GetActiveWebContents(), + ASSERT_NO_FATAL_FAILURE(OpenWindow(chrome::GetActiveWebContents(browser()), GURL(std::string("chrome-extension://") + last_loaded_extension_id_ + "/newtab.html"), false, &newtab)); diff --git a/chrome/browser/external_extension_browsertest.cc b/chrome/browser/external_extension_browsertest.cc index b377e1f..aabfb29 100644 --- a/chrome/browser/external_extension_browsertest.cc +++ b/chrome/browser/external_extension_browsertest.cc @@ -6,6 +6,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -59,7 +60,7 @@ class SearchProviderTest : public InProcessBrowserTest { ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); // Bundle up information needed to verify the result. - content::WebContents* tab = browser->GetActiveWebContents(); + content::WebContents* tab = chrome::GetActiveWebContents(browser); return IsSearchProviderTestData(tab, host, test_url); } diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc index 5021867..dd04fde 100644 --- a/chrome/browser/first_run/first_run.cc +++ b/chrome/browser/first_run/first_run.cc @@ -29,6 +29,7 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/webui/ntp/new_tab_ui.h" @@ -513,7 +514,7 @@ void FirstRunBubbleLauncher::Observe( return; } - content::WebContents* contents = browser->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser); if (contents && contents->GetURL().SchemeIs(chrome::kChromeUIScheme)) { // Suppress the first run bubble if the sync promo is showing. if (contents->GetURL().host() == chrome::kChromeUISyncPromoHost) diff --git a/chrome/browser/geolocation/geolocation_browsertest.cc b/chrome/browser/geolocation/geolocation_browsertest.cc index 6e1ca47..3441a09 100644 --- a/chrome/browser/geolocation/geolocation_browsertest.cc +++ b/chrome/browser/geolocation/geolocation_browsertest.cc @@ -18,6 +18,7 @@ #include "chrome/browser/ui/browser.h" #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/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" @@ -49,7 +50,7 @@ class IFrameLoader : public content::NotificationObserver { : navigation_completed_(false), javascript_completed_(false) { NavigationController* controller = - &browser->GetActiveWebContents()->GetController(); + &chrome::GetActiveWebContents(browser)->GetController(); registrar_.Add(this, content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>(controller)); registrar_.Add(this, content::NOTIFICATION_DOM_OPERATION_RESPONSE, @@ -59,7 +60,7 @@ class IFrameLoader : public content::NotificationObserver { "window.domAutomationController.send(addIFrame(%d, \"%s\"));", iframe_id, url.spec().c_str()); - browser->GetActiveWebContents()->GetRenderViewHost()-> + chrome::GetActiveWebContents(browser)->GetRenderViewHost()-> ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script)); ui_test_utils::RunMessageLoop(); @@ -70,7 +71,7 @@ class IFrameLoader : public content::NotificationObserver { "window.domAutomationController.send(getIFrameSrc(%d))", iframe_id); std::string iframe_src; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - browser->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser)->GetRenderViewHost(), L"", UTF8ToWide(script), &iframe_src)); iframe_url_ = GURL(iframe_src); } @@ -274,7 +275,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest { void AddGeolocationWatch(bool wait_for_infobar) { GeolocationNotificationObserver notification_observer(wait_for_infobar); notification_observer.AddWatchAndWaitForNotification( - current_browser_->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(), iframe_xpath_); if (wait_for_infobar) { EXPECT_TRUE(notification_observer.infobar_); @@ -292,7 +293,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest { } void SetInfobarResponse(const GURL& requesting_url, bool allowed) { - TabContents* tab_contents = current_browser_->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(current_browser_); TabSpecificContentSettings* content_settings = tab_contents->content_settings(); const GeolocationSettingsState& settings_state = @@ -339,7 +340,7 @@ class GeolocationBrowserTest : public InProcessBrowserTest { void CheckStringValueFromJavascript( const std::string& expected, const std::string& function) { CheckStringValueFromJavascriptForTab( - expected, function, current_browser_->GetActiveWebContents()); + expected, function, chrome::GetActiveWebContents(current_browser_)); } void NotifyGeoposition(double latitude, double longitude) { @@ -493,7 +494,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - ¤t_browser_->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(current_browser_)->GetController())); NotifyGeoposition(fresh_position_latitude, fresh_position_longitude); observer.Wait(); CheckGeoposition(fresh_position_latitude, fresh_position_longitude); @@ -529,7 +530,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - ¤t_browser_->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(current_browser_)->GetController())); NotifyGeoposition(cached_position_latitude, cached_position_lognitude); observer.Wait(); CheckGeoposition(cached_position_latitude, cached_position_lognitude); @@ -568,8 +569,8 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, iframe_xpath_ = L"//iframe[@id='iframe_1']"; AddGeolocationWatch(true); - InfoBarTabHelper* infobar_helper = current_browser_-> - GetActiveTabContents()->infobar_tab_helper(); + InfoBarTabHelper* infobar_helper = + chrome::GetActiveTabContents(current_browser_)->infobar_tab_helper(); size_t num_infobars_before_cancel = infobar_helper->infobar_count(); // Change the iframe, and ensure the infobar is gone. IFrameLoader change_iframe_1(current_browser_, 1, current_url_); @@ -583,7 +584,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, DISABLED_InvalidUrlRequest) { // correctly. Also acts as a regression test for http://crbug.com/40478 html_for_tests_ = "files/geolocation/invalid_request_url.html"; ASSERT_TRUE(Initialize(INITIALIZATION_NONE)); - WebContents* original_tab = current_browser_->GetActiveWebContents(); + WebContents* original_tab = chrome::GetActiveWebContents(current_browser_); CheckStringValueFromJavascript("1", "requestGeolocationFromInvalidUrl()"); CheckStringValueFromJavascriptForTab("1", "isAlive()", original_tab); } @@ -624,7 +625,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) { final_position_latitude, final_position_longitude); std::string js_result; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - current_browser_->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(), L"", UTF8ToWide(script), &js_result)); EXPECT_EQ(js_result, "ok"); @@ -638,7 +639,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TwoWatchesInOneFrame) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - ¤t_browser_->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(current_browser_)->GetController())); NotifyGeoposition(final_position_latitude, final_position_longitude); observer.Wait(); CheckGeoposition(final_position_latitude, final_position_longitude); @@ -663,7 +664,7 @@ IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, TabDestroyed) { "window.domAutomationController.send(window.close());"; bool result = ui_test_utils::ExecuteJavaScript( - current_browser_->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(current_browser_)->GetRenderViewHost(), L"", UTF8ToWide(script)); EXPECT_EQ(result, true); } diff --git a/chrome/browser/history/history_browsertest.cc b/chrome/browser/history/history_browsertest.cc index 0b133e7..117b043 100644 --- a/chrome/browser/history/history_browsertest.cc +++ b/chrome/browser/history/history_browsertest.cc @@ -13,6 +13,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" @@ -138,7 +139,7 @@ class HistoryBrowserTest : public InProcessBrowserTest { void LoadAndWaitForURL(const GURL& url) { string16 expected_title(ASCIIToUTF16("OK")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); ui_test_utils::NavigateToURL(browser(), url); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); @@ -277,7 +278,7 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, // Therefore, Page 11 should be in the history in addition to Page 12. LoadAndWaitForFile("history_length_test_page_11.html"); - ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents()); + ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser())); LoadAndWaitForFile("history_length_test_page_11.html"); } @@ -302,9 +303,9 @@ IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, HistorySearchXSS) { // so that we're not susceptible (less susceptible?) to a race condition. // Should a race condition ever trigger, it won't result in flakiness. int num = ui_test_utils::FindInPage( - browser()->GetActiveTabContents(), ASCIIToUTF16("<img"), true, + chrome::GetActiveTabContents(browser()), ASCIIToUTF16("<img"), true, true, NULL); EXPECT_GT(num, 0); EXPECT_EQ(ASCIIToUTF16("History"), - browser()->GetActiveWebContents()->GetTitle()); + chrome::GetActiveWebContents(browser())->GetTitle()); } diff --git a/chrome/browser/history/multipart_browsertest.cc b/chrome/browser/history/multipart_browsertest.cc index be2753f..46d3a67 100644 --- a/chrome/browser/history/multipart_browsertest.cc +++ b/chrome/browser/history/multipart_browsertest.cc @@ -5,6 +5,7 @@ #include "base/file_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -34,11 +35,11 @@ IN_PROC_BROWSER_TEST_F(MultipartResponseTest, SingleVisit) { // creates one entry in the visits table. ASSERT_TRUE(test_server()->Start()); - Observe(browser()->GetActiveWebContents()); + Observe(chrome::GetActiveWebContents(browser())); ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("multipart")); EXPECT_EQ(ASCIIToUTF16("page 9"), - browser()->GetActiveWebContents()->GetTitle()); + chrome::GetActiveWebContents(browser())->GetTitle()); EXPECT_EQ(1, update_history_count_); EXPECT_GT(did_navigate_any_frame_count_, update_history_count_); } diff --git a/chrome/browser/history/redirect_browsertest.cc b/chrome/browser/history/redirect_browsertest.cc index 3f30187..57ac553 100644 --- a/chrome/browser/history/redirect_browsertest.cc +++ b/chrome/browser/history/redirect_browsertest.cc @@ -21,6 +21,7 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -100,14 +101,14 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, Client) { EXPECT_EQ(final_url.spec(), redirects[0].spec()); // The address bar should display the final URL. - EXPECT_EQ(final_url, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(final_url, chrome::GetActiveWebContents(browser())->GetURL()); // Navigate one more time. ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), first_url, 2); // The address bar should still display the final URL. - EXPECT_EQ(final_url, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(final_url, chrome::GetActiveWebContents(browser())->GetURL()); } // http://code.google.com/p/chromium/issues/detail?id=62772 @@ -154,7 +155,7 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, ClientCancelled) { FilePath(), FilePath().AppendASCII("cancelled_redirect_test.html")); ui_test_utils::NavigateToURL(browser(), first_url); - content::WebContents* web_contents = browser()->GetActiveWebContents(); + content::WebContents* web_contents = chrome::GetActiveWebContents(browser()); content::TestNavigationObserver navigation_observer( content::Source<content::NavigationController>( &web_contents->GetController())); @@ -209,7 +210,7 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, ServerReference) { ui_test_utils::NavigateToURL(browser(), initial_url); - EXPECT_EQ(ref, browser()->GetActiveWebContents()->GetURL().ref()); + EXPECT_EQ(ref, chrome::GetActiveWebContents(browser())->GetURL().ref()); } // Test that redirect from http:// to file:// : @@ -229,7 +230,7 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, NoHttpToFile) { // We make sure the title doesn't match the title from the file, because the // nav should not have taken place. EXPECT_NE(ASCIIToUTF16("File!"), - browser()->GetActiveWebContents()->GetTitle()); + chrome::GetActiveWebContents(browser())->GetTitle()); } // Ensures that non-user initiated location changes (within page) are @@ -267,7 +268,7 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, GURL first_url = test_server()->GetURL( "client-redirect?" + slow.spec()); - content::WebContents* web_contents = browser()->GetActiveWebContents(); + content::WebContents* web_contents = chrome::GetActiveWebContents(browser()); content::TestNavigationObserver observer( content::Source<content::NavigationController>( &web_contents->GetController()), @@ -286,7 +287,7 @@ IN_PROC_BROWSER_TEST_F(RedirectTest, // Check to make sure the navigation did in fact take place and we are // at the expected page. EXPECT_EQ(ASCIIToUTF16("Title Of Awesomeness"), - browser()->GetActiveWebContents()->GetTitle()); + chrome::GetActiveWebContents(browser())->GetTitle()); bool final_navigation_not_redirect = true; std::vector<GURL> redirects = GetRedirects(first_url); diff --git a/chrome/browser/iframe_browsertest.cc b/chrome/browser/iframe_browsertest.cc index f742e15..fff8968 100644 --- a/chrome/browser/iframe_browsertest.cc +++ b/chrome/browser/iframe_browsertest.cc @@ -5,6 +5,7 @@ #include "base/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -18,7 +19,7 @@ class IFrameTest : public InProcessBrowserTest { ui_test_utils::NavigateToURL(browser(), url); EXPECT_EQ(ASCIIToUTF16(page_title), - browser()->GetActiveWebContents()->GetTitle()); + chrome::GetActiveWebContents(browser())->GetTitle()); } }; diff --git a/chrome/browser/importer/importer_host.cc b/chrome/browser/importer/importer_host.cc index 3b0a34c..38d51fb 100644 --- a/chrome/browser/importer/importer_host.cc +++ b/chrome/browser/importer/importer_host.cc @@ -21,6 +21,7 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/simple_message_box.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" @@ -165,7 +166,8 @@ void ImporterHost::OnGoogleGAIACookieChecked(bool result) { DCHECK(profile_); Browser* browser = browser::FindLastActiveWithProfile(profile_); if (browser) - browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser, url, + content::PAGE_TRANSITION_TYPED); MessageLoop::current()->PostTask(FROM_HERE, base::Bind( &ImporterHost::OnImportLockDialogEnd, this, false)); diff --git a/chrome/browser/infobars/infobars_browsertest.cc b/chrome/browser/infobars/infobars_browsertest.cc index 495413b..8b265b7 100644 --- a/chrome/browser/infobars/infobars_browsertest.cc +++ b/chrome/browser/infobars/infobars_browsertest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.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/chrome_switches.h" @@ -73,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) { infobar_added_2.Wait(); infobar_removed_1.Wait(); EXPECT_EQ(0u, - browser()->GetTabContentsAt(0)->infobar_tab_helper()-> + chrome::GetTabContentsAt(browser(), 0)->infobar_tab_helper()-> infobar_count()); ui_test_utils::WindowedNotificationObserver infobar_removed_2( @@ -82,6 +83,6 @@ IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) { ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme(); infobar_removed_2.Wait(); EXPECT_EQ(0u, - browser()->GetActiveTabContents()->infobar_tab_helper()-> + chrome::GetActiveTabContents(browser())->infobar_tab_helper()-> infobar_count()); } diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index 116c81f..202b4d0 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -17,6 +17,7 @@ #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager_browsertest_util.h" #include "chrome/browser/ui/browser.h" +#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/omnibox/omnibox_edit_model.h" @@ -320,7 +321,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(OnSubmitEvent)) { EXPECT_FALSE(preview()); EXPECT_FALSE(instant()->is_displayable()); EXPECT_FALSE(instant()->IsCurrent()); - EXPECT_EQ(preview_tab, browser()->GetActiveWebContents()); + EXPECT_EQ(preview_tab, chrome::GetActiveWebContents(browser())); // We should have two entries. One corresponding to the page the user was // first on, and one for the search page. @@ -358,7 +359,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, DISABLED_OnCancelEvent) { EXPECT_FALSE(preview()); EXPECT_FALSE(instant()->is_displayable()); EXPECT_FALSE(instant()->IsCurrent()); - EXPECT_EQ(preview_tab, browser()->GetActiveWebContents()); + EXPECT_EQ(preview_tab, chrome::GetActiveWebContents(browser())); // Check that the value is reflected and oncancel is called. EXPECT_EQ("true 0 1 1 true d false def false 3 3", @@ -721,7 +722,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(DontPersistSearchbox)) { EXPECT_FALSE(preview()); // The searchBox actually gets cleared on commit. - ASSERT_TRUE(GetStringFromJavascript(browser()->GetActiveWebContents(), + ASSERT_TRUE(GetStringFromJavascript(chrome::GetActiveWebContents(browser()), "window.chrome.searchBox.value", &value)); EXPECT_EQ("", value); @@ -729,7 +730,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(DontPersistSearchbox)) { ui_test_utils::NavigateToURL( browser(), test_server()->GetURL("files/empty.html")); - ASSERT_TRUE(GetStringFromJavascript(browser()->GetActiveWebContents(), + ASSERT_TRUE(GetStringFromJavascript(chrome::GetActiveWebContents(browser()), "window.chrome.searchBox.value", &value)); EXPECT_EQ("", value); } @@ -792,7 +793,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(PageVisibilityTest)) { // Initially navigate to the empty page which should be visible. ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("")); - WebContents* initial_contents = browser()->GetActiveWebContents(); + WebContents* initial_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(CheckVisibilityIs(initial_contents, true)); @@ -817,7 +818,7 @@ IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE(PageVisibilityTest)) { // Commit the preview. ASSERT_TRUE(PressEnter()); - EXPECT_EQ(preview_contents, browser()->GetActiveWebContents()); + EXPECT_EQ(preview_contents, chrome::GetActiveWebContents(browser())); ASSERT_TRUE(CheckVisibilityIs(preview_contents, true)); } diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc index 6d4aaa9..3d8bc3e 100644 --- a/chrome/browser/lifetime/application_lifetime.cc +++ b/chrome/browser/lifetime/application_lifetime.cc @@ -16,6 +16,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.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" @@ -196,7 +197,7 @@ void CloseAllBrowsers() { // DestroyBrowser to make sure the browser is deleted and cleanup can // happen. while (browser->tab_count()) - delete browser->GetTabContentsAt(0); + delete chrome::GetTabContentsAt(browser, 0); browser->window()->DestroyBrowser(); i = BrowserList::begin(); if (i != BrowserList::end() && browser == *i) { diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc index 28b711b..d1385b0 100644 --- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc +++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -19,7 +20,7 @@ class LoadtimesExtensionBindingsTest : public InProcessBrowserTest { // before we read them. We ought to test that too. Until the race is fixed, // zero it out so the test is stable. content::RenderViewHost* rvh = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( rvh, L"", L"window.before.firstPaintAfterLoadTime = 0;" @@ -45,7 +46,7 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest, GURL plain_url = test_server()->GetURL("blank"); ui_test_utils::NavigateToURL(browser(), plain_url); content::RenderViewHost* rvh = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( rvh, L"", L"window.before = window.chrome.loadTimes()")); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( @@ -62,7 +63,7 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest, GURL hash_url(plain_url.spec() + "#"); ui_test_utils::NavigateToURL(browser(), plain_url); content::RenderViewHost* rvh = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( rvh, L"", L"window.before = window.chrome.loadTimes()")); ui_test_utils::NavigateToURL(browser(), hash_url); diff --git a/chrome/browser/net/load_timing_observer_browsertest.cc b/chrome/browser/net/load_timing_observer_browsertest.cc index 2fb2bb6..e080681 100644 --- a/chrome/browser/net/load_timing_observer_browsertest.cc +++ b/chrome/browser/net/load_timing_observer_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -29,7 +30,7 @@ IN_PROC_BROWSER_TEST_F(LoadTimingObserverTest, FLAKY_CacheHitAfterRedirect) { int response_start = 0; int response_end = 0; content::RenderViewHost* render_view_host = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( render_view_host, L"", L"window.domAutomationController.send(" diff --git a/chrome/browser/notifications/balloon_host.cc b/chrome/browser/notifications/balloon_host.cc index 9968845..2596142 100644 --- a/chrome/browser/notifications/balloon_host.cc +++ b/chrome/browser/notifications/balloon_host.cc @@ -11,6 +11,7 @@ #include "chrome/browser/renderer_preferences_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/browser/view_type_utils.h" #include "chrome/common/chrome_notification_types.h" @@ -82,9 +83,10 @@ void BalloonHost::AddNewContents(WebContents* source, bool user_gesture) { Browser* browser = browser::FindLastActiveWithProfile( Profile::FromBrowserContext(new_contents->GetBrowserContext())); - if (!browser) - return; - browser->AddWebContents(new_contents, disposition, initial_pos, user_gesture); + if (browser) { + chrome::AddWebContents(browser, NULL, new_contents, disposition, + initial_pos, user_gesture); + } } void BalloonHost::RenderViewCreated(content::RenderViewHost* render_view_host) { diff --git a/chrome/browser/notifications/notification_browsertest.cc b/chrome/browser/notifications/notification_browsertest.cc index 48e34d9..da1b5bd 100644 --- a/chrome/browser/notifications/notification_browsertest.cc +++ b/chrome/browser/notifications/notification_browsertest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/infobars/infobar_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/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -31,13 +32,13 @@ IN_PROC_BROWSER_TEST_F(NotificationsPermissionTest, TestUserGestureInfobar) { // That's considered a user gesture to webkit, and should produce an infobar. bool result; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(request());", &result)); EXPECT_TRUE(result); - EXPECT_EQ(1U, browser()->GetTabContentsAt(0)->infobar_tab_helper()-> + EXPECT_EQ(1U, chrome::GetTabContentsAt(browser(), 0)->infobar_tab_helper()-> infobar_count()); } @@ -52,6 +53,6 @@ IN_PROC_BROWSER_TEST_F(NotificationsPermissionTest, TestNoUserGestureInfobar) { test_server()->GetURL( "files/notifications/notifications_request_inline.html")); - EXPECT_EQ(0U, browser()->GetTabContentsAt(0)->infobar_tab_helper()-> + EXPECT_EQ(0U, chrome::GetTabContentsAt(browser(), 0)->infobar_tab_helper()-> infobar_count()); } diff --git a/chrome/browser/page_cycler/page_cycler.cc b/chrome/browser/page_cycler/page_cycler.cc index a5c1cb2..dea717b 100644 --- a/chrome/browser/page_cycler/page_cycler.cc +++ b/chrome/browser/page_cycler/page_cycler.cc @@ -14,6 +14,7 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/chrome_process_util.h" #include "chrome/test/perf/perf_test.h" @@ -30,7 +31,7 @@ using content::WebContents; PageCycler::PageCycler(Browser* browser, const FilePath& urls_file) - : content::WebContentsObserver(browser->GetActiveWebContents()), + : content::WebContentsObserver(chrome::GetActiveWebContents(browser)), browser_(browser), urls_file_(urls_file), url_index_(0), @@ -130,7 +131,7 @@ void PageCycler::BeginCycle() { // result in the browser being in a state of loading when PageCycler is ready // to start. Instead of interrupting the load, we wait for it to finish, and // will call LoadNextURL() from DidFinishLoad() or DidFailProvisionalLoad(). - if (browser_->GetActiveWebContents()->IsLoading()) + if (chrome::GetActiveWebContents(browser_)->IsLoading()) return; LoadNextURL(); } diff --git a/chrome/browser/page_cycler/page_cycler_unittest.cc b/chrome/browser/page_cycler/page_cycler_unittest.cc index 989f569c..6b6e408 100644 --- a/chrome/browser/page_cycler/page_cycler_unittest.cc +++ b/chrome/browser/page_cycler/page_cycler_unittest.cc @@ -11,6 +11,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/page_cycler/page_cycler.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/browser_with_test_window_test.h" @@ -108,7 +109,7 @@ class PageCyclerTest : public BrowserWithTestWindowTest { BrowserWithTestWindowTest::SetUp(); AddTab(browser(), kAboutURL); - ASSERT_FALSE(browser()->GetActiveWebContents() == NULL); + ASSERT_FALSE(chrome::GetActiveWebContents(browser()) == NULL); } void InitFilePaths(const FilePath& temp_path) { diff --git a/chrome/browser/popup_blocker_browsertest.cc b/chrome/browser/popup_blocker_browsertest.cc index a84b4e0..7112855 100644 --- a/chrome/browser/popup_blocker_browsertest.cc +++ b/chrome/browser/popup_blocker_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/in_process_browser_test.h" @@ -36,7 +37,7 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, PopupBlockedPostBlank) { // to the original URL. EXPECT_EQ(1u, browser::GetBrowserCount(browser()->profile())); EXPECT_EQ(1, browser()->tab_count()); - WebContents* cur_tab = browser()->GetActiveWebContents(); + WebContents* cur_tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(cur_tab); EXPECT_EQ(url, cur_tab->GetURL()); } diff --git a/chrome/browser/prerender/prefetch_browsertest.cc b/chrome/browser/prerender/prefetch_browsertest.cc index a7f13dc..87c8349 100644 --- a/chrome/browser/prerender/prefetch_browsertest.cc +++ b/chrome/browser/prerender/prefetch_browsertest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -53,8 +54,9 @@ IN_PROC_BROWSER_TEST_F(PrefetchBrowserTest, PrefetchOn) { GURL url = test_server()->GetURL(kPrefetchPage); const string16 expected_title = ASCIIToUTF16("link onload"); - ui_test_utils::TitleWatcher title_watcher(browser()->GetActiveWebContents(), - expected_title); + ui_test_utils::TitleWatcher title_watcher( + chrome::GetActiveWebContents(browser()), + expected_title); ui_test_utils::NavigateToURL(browser(), url); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); @@ -65,8 +67,9 @@ IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestNoPrefetching, PrefetchOff) { GURL url = test_server()->GetURL(kPrefetchPage); const string16 expected_title = ASCIIToUTF16("link onerror"); - ui_test_utils::TitleWatcher title_watcher(browser()->GetActiveWebContents(), - expected_title); + ui_test_utils::TitleWatcher title_watcher( + chrome::GetActiveWebContents(browser()), + expected_title); ui_test_utils::NavigateToURL(browser(), url); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index fffe4ed..1ae6186 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -28,6 +28,7 @@ #include "chrome/browser/ui/browser.h" #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/browser_window.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" @@ -638,7 +639,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest { content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::NotificationService::AllSources()); RenderViewHost* render_view_host = - current_browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(); render_view_host->ExecuteJavascriptInWebFrame( string16(), ASCIIToUTF16("ClickOpenLink()")); @@ -670,8 +671,8 @@ class PrerenderBrowserTest : public InProcessBrowserTest { back_nav_observer.Wait(); bool original_prerender_page = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - current_browser()->GetActiveWebContents()->GetRenderViewHost(), L"", - L"window.domAutomationController.send(IsOriginalPrerenderPage())", + chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(), + L"", L"window.domAutomationController.send(IsOriginalPrerenderPage())", &original_prerender_page)); EXPECT_TRUE(original_prerender_page); } @@ -680,7 +681,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest { // in. This must be called when the prerendered page is the current page // in the active tab. void GoBackToPageBeforePrerender() { - WebContents* tab = current_browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(current_browser()); ASSERT_TRUE(tab); EXPECT_FALSE(tab->IsLoading()); ui_test_utils::WindowedNotificationObserver back_nav_observer( @@ -728,16 +729,15 @@ class PrerenderBrowserTest : public InProcessBrowserTest { } PrerenderManager* GetPrerenderManager() const { - Profile* profile = current_browser()->GetActiveTabContents()->profile(); PrerenderManager* prerender_manager = - PrerenderManagerFactory::GetForProfile(profile); + PrerenderManagerFactory::GetForProfile(current_browser()->profile()); return prerender_manager; } const PrerenderLinkManager* GetPrerenderLinkManager() const { - Profile* profile = current_browser()->GetActiveTabContents()->profile(); PrerenderLinkManager* prerender_link_manager = - PrerenderLinkManagerFactory::GetForProfile(profile); + PrerenderLinkManagerFactory::GetForProfile( + current_browser()->profile()); return prerender_link_manager; } @@ -948,7 +948,7 @@ class PrerenderBrowserTest : public InProcessBrowserTest { ASSERT_TRUE(prerender_contents != NULL); RenderViewHost* render_view_host = - current_browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(current_browser())->GetRenderViewHost(); render_view_host->ExecuteJavascriptInWebFrame( string16(), ASCIIToUTF16(javascript_function_name)); @@ -1113,7 +1113,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderNaClPluginDisabled) { // TODO(mmenke): While this should reliably fail on regressions, the // reliability depends on the specifics of ppapi plugin // loading. It would be great if we could avoid that. - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); bool display_test_result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( web_contents->GetRenderViewHost(), L"", @@ -1606,7 +1606,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, DISABLED_PrerenderWindowSize) { #else IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderWindowSize) { #endif - ui_test_utils::CloseAllInfoBars(browser()->GetActiveTabContents()); + ui_test_utils::CloseAllInfoBars(chrome::GetActiveTabContents(browser())); PrerenderTestURL("files/prerender/prerender_size.html", FINAL_STATUS_USED, @@ -2034,7 +2034,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, MAYBE_PrerenderUnload) { PrerenderTestURL("files/prerender/prerender_page.html", FINAL_STATUS_USED, 1); string16 expected_title = ASCIIToUTF16("Unloaded"); ui_test_utils::TitleWatcher title_watcher( - current_browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(current_browser()), expected_title); NavigateToDestURL(); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); } @@ -2161,7 +2161,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, PrerenderClickNewBackgroundTab) { IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, NavigateToPrerenderedPageWhenDevToolsAttached) { DisableJavascriptCalls(); - WebContents* web_contents = current_browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(current_browser()); DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost( web_contents->GetRenderViewHost()); DevToolsManager* manager = DevToolsManager::GetInstance(); @@ -2229,7 +2229,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithNaCl, // To avoid any chance of a race, we have to let the script send its response // asynchronously. - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); bool display_test_result = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( web_contents->GetRenderViewHost(), L"", diff --git a/chrome/browser/printing/print_preview_tab_controller_browsertest.cc b/chrome/browser/printing/print_preview_tab_controller_browsertest.cc index 3f36760..427691c 100644 --- a/chrome/browser/printing/print_preview_tab_controller_browsertest.cc +++ b/chrome/browser/printing/print_preview_tab_controller_browsertest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/printing/print_view_manager.h" #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" @@ -57,7 +58,7 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTabControllerBrowserTest, EXPECT_EQ(1, browser()->tab_count()); // Create a reference to initiator tab contents. - TabContents* initiator_tab = browser()->GetActiveTabContents(); + TabContents* initiator_tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(initiator_tab); printing::PrintPreviewTabController* tab_controller = @@ -99,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(PrintPreviewTabControllerBrowserTest, EXPECT_EQ(1, browser()->tab_count()); // Create a reference to initiator tab contents. - TabContents* initiator_tab = browser()->GetActiveTabContents(); + TabContents* initiator_tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(initiator_tab); printing::PrintPreviewTabController* tab_controller = diff --git a/chrome/browser/printing/print_preview_tab_controller_unittest.cc b/chrome/browser/printing/print_preview_tab_controller_unittest.cc index a86253b1..fe84d1c 100644 --- a/chrome/browser/printing/print_preview_tab_controller_unittest.cc +++ b/chrome/browser/printing/print_preview_tab_controller_unittest.cc @@ -7,6 +7,7 @@ #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/ui/browser_commands.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/browser/ui/webui/print_preview/print_preview_ui.h" @@ -42,7 +43,7 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_GetOrCreatePreviewTab) { EXPECT_EQ(1, browser()->tab_count()); // Create a reference to initiator tab contents. - TabContents* initiator_tab = browser()->GetActiveTabContents(); + TabContents* initiator_tab = chrome::GetActiveTabContents(browser()); printing::PrintPreviewTabController* tab_controller = printing::PrintPreviewTabController::GetInstance(); @@ -77,11 +78,11 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_MultiplePreviewTabs) { EXPECT_EQ(0, browser()->tab_count()); chrome::NewTab(browser()); - TabContents* tab_contents_1 = browser()->GetActiveTabContents(); + TabContents* tab_contents_1 = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(tab_contents_1); chrome::NewTab(browser()); - TabContents* tab_contents_2 = browser()->GetActiveTabContents(); + TabContents* tab_contents_2 = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(tab_contents_2); EXPECT_EQ(2, browser()->tab_count()); @@ -134,7 +135,7 @@ TEST_F(PrintPreviewTabControllerUnitTest, MAYBE_ClearInitiatorTabDetails) { EXPECT_EQ(1, browser()->tab_count()); // Create a reference to initiator tab contents. - TabContents* initiator_tab = browser()->GetActiveTabContents(); + TabContents* initiator_tab = chrome::GetActiveTabContents(browser()); printing::PrintPreviewTabController* tab_controller = printing::PrintPreviewTabController::GetInstance(); diff --git a/chrome/browser/printing/printing_layout_browsertest.cc b/chrome/browser/printing/printing_layout_browsertest.cc index 52f60b8..1e30616 100644 --- a/chrome/browser/printing/printing_layout_browsertest.cc +++ b/chrome/browser/printing/printing_layout_browsertest.cc @@ -16,6 +16,7 @@ #include "chrome/browser/printing/print_view_manager.h" #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_paths.h" #include "chrome/common/chrome_switches.h" @@ -64,7 +65,7 @@ class PrintingLayoutTest : public PrintingTest<InProcessBrowserTest>, registrar_.Add(this, chrome::NOTIFICATION_PRINT_JOB_EVENT, content::NotificationService::AllSources()); - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); tab->print_view_manager()->PrintNow(); ui_test_utils::RunMessageLoop(); registrar_.RemoveAll(); diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc index 7d59dbd..043f796 100644 --- a/chrome/browser/referrer_policy_browsertest.cc +++ b/chrome/browser/referrer_policy_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/tab_contents/render_view_context_menu_browsertest_util.h" #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_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" @@ -138,7 +139,7 @@ class ReferrerPolicyTest : public InProcessBrowserTest { content::NotificationService::AllSources()); string16 expected_title = GetExpectedTitle(start_url, expected_referrer); - content::WebContents* tab = browser()->GetActiveWebContents(); + content::WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::TitleWatcher title_watcher(tab, expected_title); // Watch for all possible outcomes to avoid timeouts if something breaks. @@ -378,7 +379,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, History) { string16 expected_title = GetExpectedTitle(start_url, EXPECT_ORIGIN_AS_REFERRER); - content::WebContents* tab = browser()->GetActiveWebContents(); + content::WebContents* tab = chrome::GetActiveWebContents(browser()); scoped_ptr<ui_test_utils::TitleWatcher> title_watcher( new ui_test_utils::TitleWatcher(tab, expected_title)); diff --git a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc index db85337..16b924d 100644 --- a/chrome/browser/renderer_host/web_cache_manager_browsertest.cc +++ b/chrome/browser/renderer_host/web_cache_manager_browsertest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/renderer_host/web_cache_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/render_process_host.h" @@ -33,26 +34,26 @@ IN_PROC_BROWSER_TEST_F(WebCacheManagerBrowserTest, CrashOnceOnly) { chrome::NewTab(browser()); ui_test_utils::NavigateToURL(browser(), url); - WebContents* tab = browser()->GetWebContentsAt(0); + WebContents* tab = chrome::GetWebContentsAt(browser(), 0); ASSERT_TRUE(tab != NULL); base::KillProcess(tab->GetRenderProcessHost()->GetHandle(), content::RESULT_CODE_KILLED, true); - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); chrome::NewTab(browser()); ui_test_utils::NavigateToURL(browser(), url); - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); chrome::NewTab(browser()); ui_test_utils::NavigateToURL(browser(), url); // We would have crashed at the above line with the bug. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); chrome::CloseTab(browser()); - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); chrome::CloseTab(browser()); - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); chrome::CloseTab(browser()); ui_test_utils::NavigateToURL(browser(), url); diff --git a/chrome/browser/repost_form_warning_browsertest.cc b/chrome/browser/repost_form_warning_browsertest.cc index c5863c8..36025f0 100644 --- a/chrome/browser/repost_form_warning_browsertest.cc +++ b/chrome/browser/repost_form_warning_browsertest.cc @@ -5,6 +5,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" @@ -32,7 +33,7 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestDoubleReload) { GURL("javascript:document.getElementById('form').submit()")); // Try to reload it twice, checking for repost. - content::WebContents* web_contents = browser()->GetActiveWebContents(); + content::WebContents* web_contents = chrome::GetActiveWebContents(browser()); web_contents->GetController().Reload(true); web_contents->GetController().Reload(true); @@ -64,7 +65,7 @@ IN_PROC_BROWSER_TEST_F(RepostFormWarningTest, TestLoginAfterRepost) { GURL("javascript:document.getElementById('form').submit()")); // Try to reload it, checking for repost. - content::WebContents* web_contents = browser()->GetActiveWebContents(); + content::WebContents* web_contents = chrome::GetActiveWebContents(browser()); web_contents->GetController().Reload(true); // Navigate to a page that requires authentication, bringing up another diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc index 4956e73..394f2c6 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc @@ -15,6 +15,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #include "chrome/browser/safe_browsing/safe_browsing_service.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/pref_names.h" #include "chrome/common/url_constants.h" @@ -261,7 +262,7 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest { } void SendCommand(const std::string& command) { - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); // We use InterstitialPage::GetInterstitialPage(tab) instead of // tab->GetInterstitialPage() because the tab doesn't have a pointer // to its interstital page until it gets a command from the renderer @@ -276,7 +277,7 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest { } void DontProceedThroughInterstitial() { - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); InterstitialPage* interstitial_page = InterstitialPage::GetInterstitialPage( contents); ASSERT_TRUE(interstitial_page); @@ -284,7 +285,7 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest { } void ProceedThroughInterstitial() { - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); InterstitialPage* interstitial_page = InterstitialPage::GetInterstitialPage( contents); ASSERT_TRUE(interstitial_page); @@ -292,7 +293,7 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest { } void AssertNoInterstitial(bool wait_for_delete) { - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); if (contents->ShowingInterstitialPage() && wait_for_delete) { // We'll get notified when the interstitial is deleted. @@ -308,14 +309,14 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest { } bool YesInterstitial() { - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); InterstitialPage* interstitial_page = InterstitialPage::GetInterstitialPage( contents); return interstitial_page != NULL; } void WaitForInterstitial() { - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); ui_test_utils::WindowedNotificationObserver interstitial_observer( content::NOTIFICATION_INTERSTITIAL_ATTACHED, content::Source<WebContents>(contents)); @@ -357,13 +358,13 @@ class SafeBrowsingBlockingPageTest : public InProcessBrowserTest { ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); WaitForInterstitial(); // Cancel the redirect request while interstitial page is open. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ui_test_utils::NavigateToURLWithDisposition( browser(), GURL("javascript:stopWin()"), CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); // Simulate the user clicking "proceed", there should be no crash. SendCommand("\"proceed\""); } @@ -409,7 +410,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareDontProceed) { AssertNoInterstitial(false); // Assert the interstitial is gone EXPECT_EQ( GURL(chrome::kAboutBlankURL), // Back to "about:blank" - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareProceed) { @@ -422,11 +423,11 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareProceed) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); SendCommand("\"proceed\""); // Simulate the user clicking "proceed" observer.Wait(); AssertNoInterstitial(true); // Assert the interstitial is gone. - EXPECT_EQ(url, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) { @@ -439,7 +440,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingDontProceed) { AssertNoInterstitial(false); // Assert the interstitial is gone EXPECT_EQ( GURL(chrome::kAboutBlankURL), // We are back to "about:blank". - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingProceed) { @@ -453,11 +454,11 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingProceed) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); SendCommand("\"proceed\""); // Simulate the user clicking "proceed". observer.Wait(); AssertNoInterstitial(true); // Assert the interstitial is gone - EXPECT_EQ(url, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingReportError) { @@ -471,7 +472,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingReportError) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); SendCommand("\"reportError\""); // Simulate the user clicking "report error" observer.Wait(); AssertNoInterstitial(false); // Assert the interstitial is gone @@ -479,7 +480,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, PhishingReportError) { // We are in the error reporting page. EXPECT_EQ( "/safebrowsing/report_error/", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, @@ -494,7 +495,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); SendCommand("\"learnMore\""); // Simulate the user clicking "learn more" observer.Wait(); AssertNoInterstitial(false); // Assert the interstitial is gone @@ -502,7 +503,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, // We are in the help page. EXPECT_EQ( "/support/bin/answer.py", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeDontProceed) { @@ -515,14 +516,14 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, MalwareIframeDontProceed) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); SendCommand("\"takeMeBack\""); // Simulate the user clicking "back" observer.Wait(); AssertNoInterstitial(false); // Assert the interstitial is gone EXPECT_EQ( GURL(chrome::kAboutBlankURL), // Back to "about:blank" - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // Crashy, http://crbug.com/68834. @@ -537,7 +538,7 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, SendCommand("\"proceed\""); // Simulate the user clicking "proceed" AssertNoInterstitial(true); // Assert the interstitial is gone - EXPECT_EQ(url, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, @@ -558,6 +559,6 @@ IN_PROC_BROWSER_TEST_F(SafeBrowsingBlockingPageTest, SendCommand("\"proceed\""); // Simulate the user clicking "back" AssertNoInterstitial(true); // Assert the interstitial is gone - EXPECT_EQ(url, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL()); AssertReportSent(); } diff --git a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc index adb5af9..c4638b2 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service_browsertest.cc @@ -22,6 +22,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/in_process_browser_test.h" @@ -361,7 +362,7 @@ class SafeBrowsingServiceTest : public InProcessBrowserTest { } bool ShowingInterstitialPage() { - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); InterstitialPage* interstitial_page = contents->GetInterstitialPage(); return interstitial_page != NULL; } diff --git a/chrome/browser/sessions/session_restore.cc b/chrome/browser/sessions/session_restore.cc index cd71d73..ab28e8c 100644 --- a/chrome/browser/sessions/session_restore.cc +++ b/chrome/browser/sessions/session_restore.cc @@ -27,6 +27,8 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabrestore.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" @@ -267,7 +269,7 @@ void TabLoader::LoadNextTab() { content::WebContents* contents = tab->GetWebContents(); if (contents) { Browser* browser = browser::FindBrowserWithWebContents(contents); - if (browser && browser->GetActiveWebContents() != contents) { + if (browser && chrome::GetActiveWebContents(browser) != contents) { // By default tabs are marked as visible. As only the active tab is // visible we need to explicitly tell non-active tabs they are hidden. // Without this call non-active tabs are not marked as backgrounded. @@ -554,7 +556,7 @@ class SessionRestoreImpl : public content::NotificationObserver { RestoreTabsToBrowser(*(*i), browser, selected_tab_index); ShowBrowser(browser, selected_tab_index); tab_loader_->TabIsLoading( - &browser->GetActiveWebContents()->GetController()); + &chrome::GetActiveWebContents(browser)->GetController()); NotifySessionServiceOfRestoredTabs(browser, initial_tab_count); } @@ -582,14 +584,16 @@ class SessionRestoreImpl : public content::NotificationObserver { if (disposition == CURRENT_TAB) { DCHECK(!use_new_window); - browser->ReplaceRestoredTab(tab.navigations, - selected_index, - true, - tab.extension_app_id, - NULL); + chrome::ReplaceRestoredTab(browser, + tab.navigations, + selected_index, + true, + tab.extension_app_id, + NULL); } else { int tab_index = use_new_window ? 0 : browser->active_index() + 1; - WebContents* web_contents = browser->AddRestoredTab( + WebContents* web_contents = chrome::AddRestoredTab( + browser, tab.navigations, tab_index, selected_index, @@ -603,7 +607,7 @@ class SessionRestoreImpl : public content::NotificationObserver { } if (use_new_window) { - browser->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser, 0, true); browser->window()->Show(); } NotifySessionServiceOfRestoredTabs(browser, browser->tab_count()); @@ -785,7 +789,7 @@ class SessionRestoreImpl : public content::NotificationObserver { } if ((*i)->type == Browser::TYPE_TABBED) last_browser = browser; - WebContents* active_tab = browser->GetActiveWebContents(); + WebContents* active_tab = chrome::GetActiveWebContents(browser); int initial_tab_count = browser->tab_count(); int selected_tab_index = std::max( 0, @@ -797,11 +801,11 @@ class SessionRestoreImpl : public content::NotificationObserver { if (clobber_existing_tab_ && i == windows->begin() && (*i)->type == Browser::TYPE_TABBED && active_tab && browser == browser_ && browser->tab_count() > initial_tab_count) { - browser->CloseTabContents(active_tab); + chrome::CloseWebContents(browser, active_tab); active_tab = NULL; } tab_loader_->TabIsLoading( - &browser->GetActiveWebContents()->GetController()); + &chrome::GetActiveWebContents(browser)->GetController()); NotifySessionServiceOfRestoredTabs(browser, initial_tab_count); } @@ -853,11 +857,8 @@ class SessionRestoreImpl : public content::NotificationObserver { else RestoreTab(tab, i, browser, true); } - if (selected_web_contents) { - return browser->GetIndexOfController( - &selected_web_contents->GetController()); - } - return 0; + return selected_web_contents ? + chrome::GetIndexOfTab(browser, selected_web_contents) : 0; } WebContents* RestoreTab(const SessionTab& tab, @@ -882,14 +883,15 @@ class SessionRestoreImpl : public content::NotificationObserver { } WebContents* web_contents = - browser->AddRestoredTab(tab.navigations, - tab_index, - selected_index, - tab.extension_app_id, - false, // select - tab.pinned, - true, - session_storage_namespace.get()); + chrome::AddRestoredTab(browser, + tab.navigations, + tab_index, + selected_index, + tab.extension_app_id, + false, // select + tab.pinned, + true, + session_storage_namespace.get()); // Regression check: check that the tab didn't start loading right away. The // focused tab will be loaded by Browser, and TabLoader will load the rest. DCHECK(web_contents->GetController().NeedsReload()); @@ -931,7 +933,7 @@ class SessionRestoreImpl : public content::NotificationObserver { void ShowBrowser(Browser* browser, int selected_tab_index) { DCHECK(browser); DCHECK(browser->tab_count()); - browser->ActivateTabAt(selected_tab_index, true); + chrome::ActivateTabAt(browser, selected_tab_index, true); if (browser_ == browser) return; @@ -941,7 +943,7 @@ class SessionRestoreImpl : public content::NotificationObserver { // TODO(jcampan): http://crbug.com/8123 we should not need to set the // initial focus explicitly. - browser->GetActiveWebContents()->GetView()->SetInitialFocus(); + chrome::GetActiveWebContents(browser)->GetView()->SetInitialFocus(); if (!browser_shown_) { browser_shown_ = true; @@ -963,7 +965,7 @@ class SessionRestoreImpl : public content::NotificationObserver { int add_types = TabStripModel::ADD_FORCE_INDEX; if (i == 0) add_types |= TabStripModel::ADD_ACTIVE; - int index = browser->GetIndexForInsertionDuringRestore(i); + int index = chrome::GetIndexForInsertionDuringRestore(browser, i); browser::NavigateParams params(browser, urls[i], content::PAGE_TRANSITION_START_PAGE); params.disposition = i == 0 ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; @@ -981,8 +983,8 @@ class SessionRestoreImpl : public content::NotificationObserver { if (!session_service) return; for (int i = initial_count; i < browser->tab_count(); ++i) - session_service->TabRestored(browser->GetTabContentsAt(i), - browser->IsTabPinned(i)); + session_service->TabRestored(chrome::GetTabContentsAt(browser, i), + browser->tab_strip_model()->IsTabPinned(i)); } // The profile to create the sessions for. diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 3773e22..1088ad6 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -18,6 +18,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #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/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" @@ -190,7 +191,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NoSessionRestoreNewWindowChromeOS) { ASSERT_TRUE(new_browser); EXPECT_EQ(1, new_browser->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), - new_browser->GetWebContentsAt(0)->GetURL()); + chrome::GetWebContentsAt(new_browser, 0)->GetURL()); } #endif // OS_CHROMEOS @@ -244,7 +245,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ASSERT_EQ(1, new_browser->tab_count()); // And the first url should be url. - EXPECT_EQ(url, new_browser->GetWebContentsAt(0)->GetURL()); + EXPECT_EQ(url, chrome::GetWebContentsAt(new_browser, 0)->GetURL()); } #endif // !OS_CHROMEOS @@ -265,14 +266,16 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - browser()->AddSelectedTabWithURL(url2, content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), url2, + content::PAGE_TRANSITION_LINK); observer.Wait(); } { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - browser()->AddSelectedTabWithURL(url3, content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), url3, + content::PAGE_TRANSITION_LINK); observer.Wait(); } @@ -367,7 +370,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, IncognitotoNonIncognito) { // The first tab should have 'url' as its url. ASSERT_TRUE(new_browser); - EXPECT_EQ(url, new_browser->GetWebContentsAt(0)->GetURL()); + EXPECT_EQ(url, chrome::GetWebContentsAt(new_browser, 0)->GetURL()); } #endif // !OS_CHROMEOS @@ -395,12 +398,12 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignTab) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); SessionRestore::RestoreForeignSessionTab( - browser()->GetActiveWebContents(), tab, CURRENT_TAB); + chrome::GetActiveWebContents(browser()), tab, CURRENT_TAB); observer.Wait(); } ASSERT_EQ(1, browser()->tab_count()); VerifyNavigationEntries( - browser()->GetWebContentsAt(0)->GetController(), url1, url2); + chrome::GetWebContentsAt(browser(), 0)->GetController(), url1, url2); // Restore in a new tab. { @@ -408,23 +411,23 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignTab) { content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); SessionRestore::RestoreForeignSessionTab( - browser()->GetActiveWebContents(), tab, NEW_BACKGROUND_TAB); + chrome::GetActiveWebContents(browser()), tab, NEW_BACKGROUND_TAB); observer.Wait(); } ASSERT_EQ(2, browser()->tab_count()); ASSERT_EQ(0, browser()->active_index()); VerifyNavigationEntries( - browser()->GetWebContentsAt(1)->GetController(), url1, url2); + chrome::GetWebContentsAt(browser(), 1)->GetController(), url1, url2); // Restore in a new window. ui_test_utils::BrowserAddedObserver browser_observer; SessionRestore::RestoreForeignSessionTab( - browser()->GetActiveWebContents(), tab, NEW_WINDOW); + chrome::GetActiveWebContents(browser()), tab, NEW_WINDOW); Browser* new_browser = browser_observer.WaitForSingleNewBrowser(); ASSERT_EQ(1, new_browser->tab_count()); VerifyNavigationEntries( - new_browser->GetWebContentsAt(0)->GetController(), url1, url2); + chrome::GetWebContentsAt(new_browser, 0)->GetController(), url1, url2); } IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) { @@ -463,8 +466,8 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreForeignSession) { ASSERT_EQ(2u, BrowserList::size()); ASSERT_EQ(2, new_browser->tab_count()); - ASSERT_EQ(url1, new_browser->GetWebContentsAt(0)->GetURL()); - ASSERT_EQ(url2, new_browser->GetWebContentsAt(1)->GetURL()); + ASSERT_EQ(url1, chrome::GetWebContentsAt(new_browser, 0)->GetURL()); + ASSERT_EQ(url2, chrome::GetWebContentsAt(new_browser, 1)->GetURL()); // The SessionWindow destructor deletes the tabs, so we have to clear them // here to avoid a crash. @@ -477,9 +480,9 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, Basic) { Browser* new_browser = QuitBrowserAndRestore(browser(), 1); ASSERT_EQ(1u, BrowserList::size()); - ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url2_, chrome::GetActiveWebContents(new_browser)->GetURL()); GoBack(new_browser); - ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); } IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoresForwardAndBackwardNavs) { @@ -490,16 +493,16 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoresForwardAndBackwardNavs) { GoBack(browser()); Browser* new_browser = QuitBrowserAndRestore(browser(), 1); ASSERT_EQ(1u, BrowserList::size()); - ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url2_, chrome::GetActiveWebContents(new_browser)->GetURL()); GoForward(new_browser); - ASSERT_EQ(url3_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url3_, chrome::GetActiveWebContents(new_browser)->GetURL()); GoBack(new_browser); - ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url2_, chrome::GetActiveWebContents(new_browser)->GetURL()); // Test renderer-initiated back/forward as well. GURL go_back_url("javascript:history.back();"); ui_test_utils::NavigateToURL(new_browser, go_back_url); - ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); } // Tests that the SiteInstances used for entries in a restored tab's history @@ -522,18 +525,20 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ASSERT_EQ(1, new_browser->tab_count()); // Check that back and forward work as expected. - ASSERT_EQ(cross_site_url, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(cross_site_url, + chrome::GetActiveWebContents(new_browser)->GetURL()); GoBack(new_browser); - ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); GoForward(new_browser); - ASSERT_EQ(cross_site_url, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(cross_site_url, + chrome::GetActiveWebContents(new_browser)->GetURL()); // Test renderer-initiated back/forward as well. GURL go_forward_url("javascript:history.forward();"); ui_test_utils::NavigateToURL(new_browser, go_forward_url); - ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url2_, chrome::GetActiveWebContents(new_browser)->GetURL()); } IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoTabsSecondSelected) { @@ -548,9 +553,9 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoTabsSecondSelected) { ASSERT_EQ(1u, BrowserList::size()); ASSERT_EQ(2, new_browser->tab_count()); ASSERT_EQ(1, new_browser->active_index()); - ASSERT_EQ(url2_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url2_, chrome::GetActiveWebContents(new_browser)->GetURL()); - ASSERT_EQ(url1_, new_browser->GetWebContentsAt(0)->GetURL()); + ASSERT_EQ(url1_, chrome::GetWebContentsAt(new_browser, 0)->GetURL()); } // Creates two tabs, closes one, quits and makes sure only one tab is restored. @@ -565,7 +570,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, ClosedTabStaysClosed) { Browser* new_browser = QuitBrowserAndRestore(browser(), 1); AssertOneWindowWithOneTab(new_browser); - ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); } // Test to verify that the print preview tab is not restored. @@ -582,7 +587,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, DontRestorePrintPreviewTabTest) { Browser* new_browser = QuitBrowserAndRestore(browser(), 1); AssertOneWindowWithOneTab(new_browser); - ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); } // Creates a tabbed browser and popup and makes sure we restore both. @@ -660,7 +665,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, AssertOneWindowWithOneTab(new_browser); - ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); } #endif // !defined(OS_CHROMEOS) && !defined(OS_MACOSX) @@ -686,7 +691,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, TwoWindowsCloseOneRestoreOnlyOne) { AssertOneWindowWithOneTab(new_browser); - ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); } // Make sure after a restore the number of processes matches that of the number @@ -760,22 +765,22 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestorePinnedSelectedTab) { // The pinned tab is the selected tab. ASSERT_EQ(2, new_browser->tab_count()); EXPECT_EQ(0, new_browser->active_index()); - EXPECT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); - EXPECT_EQ(url2_, new_browser->GetWebContentsAt(1)->GetURL()); + EXPECT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); + EXPECT_EQ(url2_, chrome::GetWebContentsAt(new_browser, 1)->GetURL()); } IN_PROC_BROWSER_TEST_F(SessionRestoreTest, SessionStorage) { ui_test_utils::NavigateToURL(browser(), url1_); const content::NavigationController& controller = - browser()->GetActiveWebContents()->GetController(); + chrome::GetActiveWebContents(browser())->GetController(); ASSERT_TRUE(controller.GetSessionStorageNamespace()); std::string session_storage_persistent_id = controller.GetSessionStorageNamespace()->persistent_id(); Browser* new_browser = QuitBrowserAndRestore(browser(), 1); ASSERT_EQ(1u, BrowserList::size()); - ASSERT_EQ(url1_, new_browser->GetActiveWebContents()->GetURL()); + ASSERT_EQ(url1_, chrome::GetActiveWebContents(new_browser)->GetURL()); const content::NavigationController& new_controller = - new_browser->GetActiveWebContents()->GetController(); + chrome::GetActiveWebContents(new_browser)->GetController(); ASSERT_TRUE(new_controller.GetSessionStorageNamespace()); std::string restored_session_storage_persistent_id = new_controller.GetSessionStorageNamespace()->persistent_id(); diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc index e7e328d..5c945b8 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc @@ -27,6 +27,7 @@ #include "chrome/browser/sessions/session_restore.h" #include "chrome/browser/sessions/session_types.h" #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/startup/startup_browser_creator.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -1382,11 +1383,11 @@ void SessionService::BuildCommandsForBrowser( bool added_to_windows_to_track = false; for (int i = 0; i < browser->tab_count(); ++i) { - TabContents* tab = browser->GetTabContentsAt(i); + TabContents* tab = chrome::GetTabContentsAt(browser, i); DCHECK(tab); if (tab->profile() == profile() || profile() == NULL) { BuildCommandsForTab(browser->session_id(), tab, i, - browser->IsTabPinned(i), + browser->tab_strip_model()->IsTabPinned(i), commands, tab_to_available_range); if (windows_to_track && !added_to_windows_to_track) { windows_to_track->insert(browser->session_id().id()); diff --git a/chrome/browser/speech/speech_recognition_bubble_browsertest.cc b/chrome/browser/speech/speech_recognition_bubble_browsertest.cc index d3b4ed7..d329a69 100644 --- a/chrome/browser/speech/speech_recognition_bubble_browsertest.cc +++ b/chrome/browser/speech/speech_recognition_bubble_browsertest.cc @@ -5,6 +5,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/speech/speech_recognition_bubble.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/test/base/in_process_browser_test.h" #include "testing/gtest/include/gtest/gtest.h" @@ -24,14 +25,14 @@ class SpeechRecognitionBubbleTest : public SpeechRecognitionBubbleDelegate, IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, CreateAndDestroy) { gfx::Rect element_rect(100, 100, 100, 100); scoped_ptr<SpeechRecognitionBubble> bubble(SpeechRecognitionBubble::Create( - browser()->GetActiveWebContents(), this, element_rect)); + chrome::GetActiveWebContents(browser()), this, element_rect)); EXPECT_TRUE(bubble.get()); } IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, ShowAndDestroy) { gfx::Rect element_rect(100, 100, 100, 100); scoped_ptr<SpeechRecognitionBubble> bubble(SpeechRecognitionBubble::Create( - browser()->GetActiveWebContents(), this, element_rect)); + chrome::GetActiveWebContents(browser()), this, element_rect)); EXPECT_TRUE(bubble.get()); bubble->Show(); } @@ -39,7 +40,7 @@ IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, ShowAndDestroy) { IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, ShowAndHide) { gfx::Rect element_rect(100, 100, 100, 100); scoped_ptr<SpeechRecognitionBubble> bubble(SpeechRecognitionBubble::Create( - browser()->GetActiveWebContents(), this, element_rect)); + chrome::GetActiveWebContents(browser()), this, element_rect)); EXPECT_TRUE(bubble.get()); bubble->Show(); bubble->Hide(); @@ -48,7 +49,7 @@ IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, ShowAndHide) { IN_PROC_BROWSER_TEST_F(SpeechRecognitionBubbleTest, ShowAndHideTwice) { gfx::Rect element_rect(100, 100, 100, 100); scoped_ptr<SpeechRecognitionBubble> bubble(SpeechRecognitionBubble::Create( - browser()->GetActiveWebContents(), this, element_rect)); + chrome::GetActiveWebContents(browser()), this, element_rect)); EXPECT_TRUE(bubble.get()); bubble->Show(); bubble->Hide(); diff --git a/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc b/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc index 83f3dec..03a18fd 100644 --- a/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc +++ b/chrome/browser/speech/speech_recognition_bubble_controller_unittest.cc @@ -6,6 +6,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/speech/speech_recognition_bubble_controller.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/test/base/browser_with_test_window_test.h" #include "chrome/test/base/testing_profile.h" @@ -153,7 +154,7 @@ class SpeechRecognitionBubbleControllerTest // the bubble controller registers for tab close notifications which need // a valid WebContents. TabContents* tab_contents = - test_fixture_->browser()->GetActiveTabContents(); + chrome::GetActiveTabContents(test_fixture_->browser()); if (tab_contents) web_contents = tab_contents->web_contents(); return new MockSpeechRecognitionBubble(web_contents, delegate, diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 830a58d..15b71f3 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -12,6 +12,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -199,7 +200,7 @@ class SSLUITest : public InProcessBrowserTest { } int GetConstrainedWindowCount() const { - return static_cast<int>(browser()->GetActiveTabContents()-> + return static_cast<int>(chrome::GetActiveTabContents(browser())-> constrained_window_tab_helper()->constrained_window_count()); } @@ -303,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTP) { ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("files/ssl/google.html")); - CheckUnauthenticatedState(browser()->GetActiveWebContents()); + CheckUnauthenticatedState(chrome::GetActiveWebContents(browser())); } // Visits a page over http which includes broken https resources (status should @@ -323,7 +324,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPWithBrokenHTTPSResource) { ui_test_utils::NavigateToURL( browser(), test_server()->GetURL(replacement_path)); - CheckUnauthenticatedState(browser()->GetActiveWebContents()); + CheckUnauthenticatedState(chrome::GetActiveWebContents(browser())); } // http://crbug.com/91745 @@ -340,7 +341,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestOKHTTPS) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL("files/ssl/google.html")); - CheckAuthenticatedState(browser()->GetActiveWebContents(), false); + CheckAuthenticatedState(chrome::GetActiveWebContents(browser()), false); } // Visits a page with https error and proceed: @@ -350,7 +351,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) { ui_test_utils::NavigateToURL(browser(), https_server_expired_.GetURL("files/ssl/google.html")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing @@ -371,7 +372,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndDontProceed) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL("files/ssl/google.html")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); NavigationEntry* entry = tab->GetController().GetActiveEntry(); ASSERT_TRUE(entry); @@ -415,7 +416,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, // First navigate to an HTTP page. ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("files/ssl/google.html")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); NavigationEntry* entry = tab->GetController().GetActiveEntry(); ASSERT_TRUE(entry); @@ -437,7 +438,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, tab->GetRenderViewHost())); // We should be back at the original good page. - EXPECT_FALSE(browser()->GetActiveWebContents()->GetInterstitialPage()); + EXPECT_FALSE(chrome::GetActiveWebContents(browser())->GetInterstitialPage()); CheckUnauthenticatedState(tab); } @@ -451,7 +452,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, // First navigate to an HTTP page. ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("files/ssl/google.html")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); NavigationEntry* entry = tab->GetController().GetActiveEntry(); ASSERT_TRUE(entry); @@ -465,7 +466,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, tab->GetController().GoToOffset(-1); // We should be back at the original good page. - EXPECT_FALSE(browser()->GetActiveWebContents()->GetInterstitialPage()); + EXPECT_FALSE(chrome::GetActiveWebContents(browser())->GetInterstitialPage()); CheckUnauthenticatedState(tab); } @@ -477,7 +478,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoForward) { // First navigate to two HTTP pages. ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("files/ssl/google.html")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); NavigationEntry* entry1 = tab->GetController().GetActiveEntry(); ASSERT_TRUE(entry1); ui_test_utils::NavigateToURL(browser(), @@ -513,7 +514,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoForward) { } // We should be showing the second good page. - EXPECT_FALSE(browser()->GetActiveWebContents()->GetInterstitialPage()); + EXPECT_FALSE(chrome::GetActiveWebContents(browser())->GetInterstitialPage()); CheckUnauthenticatedState(tab); EXPECT_FALSE(tab->GetController().CanGoForward()); NavigationEntry* entry4 = tab->GetController().GetActiveEntry(); @@ -528,7 +529,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndClose) { ASSERT_TRUE(https_server_expired_.Start()); // Setup page title observer. - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::TitleWatcher watcher(tab, ASCIIToUTF16("PASS")); watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); @@ -545,8 +546,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndClose) { // Create tabs and visit pages which keep on creating wss connections. TabContents* tabs[16]; for (int i = 0; i < 16; ++i) { - tabs[i] = browser()->AddSelectedTabWithURL( - slaveUrl, content::PAGE_TRANSITION_LINK); + tabs[i] = chrome::AddSelectedTabWithURL(browser(), slaveUrl, + content::PAGE_TRANSITION_LINK); } chrome::SelectNextTab(browser()); @@ -558,8 +559,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndClose) { // Close tabs which contains the test page. for (int i = 0; i < 16; ++i) - browser()->CloseTabContents(tabs[i]->web_contents()); - browser()->CloseTabContents(tab); + chrome::CloseWebContents(browser(), tabs[i]->web_contents()); + chrome::CloseWebContents(browser(), tab); } // Visit a HTTPS page and proceeds despite an invalid certificate. The page @@ -578,7 +579,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestWSSInvalidCertAndGoForward) { ASSERT_TRUE(wss_server.Start(wss_root_dir)); // Setup page title observer. - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::TitleWatcher watcher(tab, ASCIIToUTF16("PASS")); watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); @@ -614,8 +615,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) { ASSERT_TRUE(https_server_expired_.Start()); GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); - TabContents* tab2 = - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + TabContents* tab2 = chrome::AddSelectedTabWithURL( + browser(), url, content::PAGE_TRANSITION_TYPED); ui_test_utils::WaitForLoadStop(tab2->web_contents()); // Verify our assumption that there was no prior navigation. @@ -650,7 +651,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestBadHTTPSDownload) { // Proceed through the SSL interstitial. This doesn't use // |ProceedThroughInterstitial| since no page load will commit. - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(tab != NULL); ASSERT_TRUE(tab->GetInterstitialPage() != NULL); { @@ -689,7 +690,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContent) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(replacement_path)); - CheckAuthenticatedState(browser()->GetActiveWebContents(), true); + CheckAuthenticatedState(chrome::GetActiveWebContents(browser()), true); } // Visits a page that runs insecure content and tries to suppress the insecure @@ -703,8 +704,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( "files/ssl/page_runs_insecure_content.html")); - CheckAuthenticationBrokenState(browser()->GetActiveWebContents(), 0, true, - false); + CheckAuthenticationBrokenState(chrome::GetActiveWebContents(browser()), 0, + true, false); } // Visits a page with unsafe content and make sure that: @@ -722,7 +723,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContents) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(replacement_path)); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); // When the bad content is filtered, the state is expected to be // authenticated. CheckAuthenticatedState(tab, false); @@ -764,7 +765,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentLoadedFromJS) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( replacement_path)); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckAuthenticatedState(tab, false); // Load the insecure image. @@ -788,7 +789,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysInsecureContentTwoTabs) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL("files/ssl/blank_page.html")); - TabContents* tab1 = browser()->GetActiveTabContents(); + TabContents* tab1 = chrome::GetActiveTabContents(browser()); // This tab should be fine. CheckAuthenticatedState(tab1->web_contents(), false); @@ -830,7 +831,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRunsInsecureContentTwoTabs) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL("files/ssl/blank_page.html")); - TabContents* tab1 = browser()->GetActiveTabContents(); + TabContents* tab1 = chrome::GetActiveTabContents(browser()); // This tab should be fine. CheckAuthenticatedState(tab1->web_contents(), false); @@ -884,7 +885,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestDisplaysCachedInsecureContent) { // Load original page over HTTP. const GURL url_http = test_server()->GetURL(replacement_path); ui_test_utils::NavigateToURL(browser(), url_http); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckUnauthenticatedState(tab); // Load again but over SSL. It should be marked as displaying insecure @@ -918,7 +919,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestRunsCachedInsecureContent) { // Load original page over HTTP. const GURL url_http = test_server()->GetURL(replacement_path); ui_test_utils::NavigateToURL(browser(), url_http); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckUnauthenticatedState(tab); // Load again but over SSL. It should be marked as displaying insecure @@ -940,7 +941,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestCNInvalidStickiness) { https_server_mismatched_.GetURL("files/ssl/google.html")); // We get an interstitial page as a result. - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_COMMON_NAME_INVALID, false, true); // Interstitial showing. ProceedThroughInterstitial(tab); @@ -978,7 +979,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRefNavigation) { ui_test_utils::NavigateToURL(browser(), https_server_expired_.GetURL("files/ssl/page_with_refs.html")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing. @@ -1013,7 +1014,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(replacement_path)); - WebContents* tab1 = browser()->GetActiveWebContents(); + WebContents* tab1 = chrome::GetActiveWebContents(browser()); // It is probably overkill to add a notification for a popup-opening, let's // just poll. for (int i = 0; i < 10; i++) { @@ -1031,11 +1032,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); observer.Wait(); // Close the first tab. - browser()->CloseTabContents(tab1); + chrome::CloseWebContents(browser(), tab1); } // Visit a page over bad https that is a redirect to a page with good https. @@ -1048,7 +1049,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectBadToGoodHTTPS) { ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec())); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing. @@ -1068,7 +1069,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectGoodToBadHTTPS) { GURL url2 = https_server_expired_.GetURL("files/ssl/google.html"); ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec())); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing. @@ -1083,7 +1084,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToGoodHTTPS) { ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(https_server_.Start()); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); // HTTP redirects to good HTTPS. GURL http_url = test_server()->GetURL("server-redirect?"); @@ -1100,7 +1101,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToBadHTTPS) { ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(https_server_expired_.Start()); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); GURL http_url = test_server()->GetURL("server-redirect?"); GURL bad_https_url = @@ -1127,18 +1128,18 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPSToHTTP) { ui_test_utils::NavigateToURL(browser(), GURL(https_url.spec() + http_url.spec())); - CheckUnauthenticatedState(browser()->GetActiveWebContents()); + CheckUnauthenticatedState(chrome::GetActiveWebContents(browser())); } // Visits a page to which we could not connect (bad port) over http and https // and make sure the security style is correct. IN_PROC_BROWSER_TEST_F(SSLUITest, TestConnectToBadPort) { ui_test_utils::NavigateToURL(browser(), GURL("http://localhost:17")); - CheckUnauthenticatedState(browser()->GetActiveWebContents()); + CheckUnauthenticatedState(chrome::GetActiveWebContents(browser())); // Same thing over HTTPS. ui_test_utils::NavigateToURL(browser(), GURL("https://localhost:17")); - CheckUnauthenticatedState(browser()->GetActiveWebContents()); + CheckUnauthenticatedState(chrome::GetActiveWebContents(browser())); } // @@ -1161,7 +1162,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) { https_server_expired_, &top_frame_path)); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(top_frame_path)); @@ -1259,7 +1260,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadFrameNavigation) { https_server_expired_, &top_frame_path)); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::NavigateToURL(browser(), https_server_expired_.GetURL(top_frame_path)); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, @@ -1298,7 +1299,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestUnauthenticatedFrameNavigation) { https_server_expired_, &top_frame_path)); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); ui_test_utils::NavigateToURL(browser(), test_server()->GetURL(top_frame_path)); CheckUnauthenticatedState(tab); @@ -1359,7 +1360,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContentsInWorkerFiltered) { &page_with_unsafe_worker_path)); ui_test_utils::NavigateToURL(browser(), https_server_.GetURL( page_with_unsafe_worker_path)); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); // Expect Worker not to load insecure content. CheckWorkerLoadResult(tab, false); // The bad content is filtered, expect the state to be authenticated. @@ -1374,7 +1375,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContentsInWorker) { // the user approves the bad certificate. ui_test_utils::NavigateToURL(browser(), https_server_expired_.GetURL("files/ssl/blank_page.html")); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, true); // Interstitial showing ProceedThroughInterstitial(tab); @@ -1409,7 +1410,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockDisplayingInsecureImage) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(replacement_path)); - CheckAuthenticatedState(browser()->GetActiveWebContents(), false); + CheckAuthenticatedState(chrome::GetActiveWebContents(browser()), false); } // Test that when the browser blocks displaying insecure content (iframes), the @@ -1428,7 +1429,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockDisplayingInsecureIframe) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(replacement_path)); - CheckAuthenticatedState(browser()->GetActiveWebContents(), false); + CheckAuthenticatedState(chrome::GetActiveWebContents(browser()), false); } @@ -1448,7 +1449,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITestBlock, TestBlockRunningInsecureContent) { ui_test_utils::NavigateToURL(browser(), https_server_.GetURL(replacement_path)); - CheckAuthenticatedState(browser()->GetActiveWebContents(), false); + CheckAuthenticatedState(chrome::GetActiveWebContents(browser()), false); } diff --git a/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc index 043dc77..ac959e0 100644 --- a/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc +++ b/chrome/browser/sync/test/integration/performance/sessions_sync_perf_test.cc @@ -5,6 +5,7 @@ #include "base/stringprintf.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/sync/profile_sync_service_harness.h" #include "chrome/browser/sync/test/integration/performance/sync_timing_helper.h" #include "chrome/browser/sync/test/integration/sessions_helper.h" @@ -75,7 +76,7 @@ void SessionsSyncPerfTest::UpdateTabs(int profile) { } void SessionsSyncPerfTest::RemoveTabs(int profile) { - GetBrowser(profile)->CloseAllTabs(); + chrome::CloseAllTabs(GetBrowser(profile)); } int SessionsSyncPerfTest::GetTabCount(int profile) { diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index cab7ecf..e1a9781 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -30,6 +30,7 @@ #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/net/gaia/gaia_urls.h" @@ -617,7 +618,7 @@ void SyncTest::DisableNotificationsImpl() { std::string path = "chromiumsync/disablenotifications"; ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); ASSERT_EQ("Notifications disabled", - UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle())); + UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle())); } void SyncTest::DisableNotifications() { @@ -630,7 +631,7 @@ void SyncTest::EnableNotificationsImpl() { std::string path = "chromiumsync/enablenotifications"; ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); ASSERT_EQ("Notifications enabled", - UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle())); + UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle())); } void SyncTest::EnableNotifications() { @@ -650,7 +651,7 @@ void SyncTest::TriggerNotification( syncer::kSyncP2PNotificationChannel + "&data=" + data; ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); ASSERT_EQ("Notification sent", - UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle())); + UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle())); } bool SyncTest::ServerSupportsErrorTriggering() const { @@ -675,7 +676,7 @@ void SyncTest::TriggerMigrationDoneError( } ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); ASSERT_EQ("Migration: 200", - UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle())); + UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle())); } void SyncTest::TriggerBirthdayError() { @@ -683,7 +684,7 @@ void SyncTest::TriggerBirthdayError() { std::string path = "chromiumsync/birthdayerror"; ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); ASSERT_EQ("Birthday error", - UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle())); + UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle())); } void SyncTest::TriggerTransientError() { @@ -691,7 +692,7 @@ void SyncTest::TriggerTransientError() { std::string path = "chromiumsync/transienterror"; ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); ASSERT_EQ("Transient error", - UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle())); + UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle())); } void SyncTest::TriggerAuthError() { @@ -769,7 +770,7 @@ void SyncTest::TriggerSyncError(const syncer::SyncProtocolError& error, ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); std::string output = UTF16ToASCII( - browser()->GetActiveWebContents()->GetTitle()); + chrome::GetActiveWebContents(browser())->GetTitle()); ASSERT_TRUE(output.find("SetError: 200") != string16::npos); } @@ -778,7 +779,7 @@ void SyncTest::TriggerCreateSyncedBookmarks() { std::string path = "chromiumsync/createsyncedbookmarks"; ui_test_utils::NavigateToURL(browser(), sync_server_.GetURL(path)); ASSERT_EQ("Synced Bookmarks", - UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle())); + UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle())); } int SyncTest::NumberOfDefaultSyncItems() const { diff --git a/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc b/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc index 362d57f..7f60468 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_browsertest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/browser/tab_contents/render_view_context_menu_browsertest_util.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -55,7 +56,7 @@ class ContextMenuBrowserTest : public InProcessBrowserTest { params.media_type = WebKit::WebContextMenuData::MediaTypeNone; params.unfiltered_link_url = unfiltered_url; params.link_url = url; - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); params.page_url = web_contents->GetController().GetActiveEntry()->GetURL(); #if defined(OS_MACOSX) params.writing_direction_default = 0; @@ -63,7 +64,7 @@ class ContextMenuBrowserTest : public InProcessBrowserTest { params.writing_direction_right_to_left = 0; #endif // OS_MACOSX TestRenderViewContextMenu* menu = new TestRenderViewContextMenu( - browser()->GetActiveWebContents(), params); + chrome::GetActiveWebContents(browser()), params); menu->Init(); return menu; } @@ -116,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(ContextMenuBrowserTest, mouse_event.x = 15; mouse_event.y = 15; gfx::Rect offset; - content::WebContents* tab = browser()->GetActiveWebContents(); + content::WebContents* tab = chrome::GetActiveWebContents(browser()); tab->GetView()->GetContainerBounds(&offset); mouse_event.globalX = 15 + offset.x(); mouse_event.globalY = 15 + offset.y(); diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc index 7084bdc..9a8b9b5 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc @@ -6,6 +6,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -34,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) { // Check that the title didn't get set. It should not be there (because we // are in view-source mode). EXPECT_NE(ASCIIToUTF16("foo"), - browser()->GetActiveWebContents()->GetTitle()); + chrome::GetActiveWebContents(browser())->GetTitle()); } // This test renders a page normally and then renders the same page in @@ -55,7 +56,7 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) { // The URL should still be prefixed with "view-source:". EXPECT_EQ(url_viewsource.spec(), - browser()->GetActiveWebContents()->GetURL().spec()); + chrome::GetActiveWebContents(browser())->GetURL().spec()); } // Make sure that when looking at the actual page, we can select "View Source" diff --git a/chrome/browser/tab_restore_browsertest.cc b/chrome/browser/tab_restore_browsertest.cc index 448fc8e..6f15408 100644 --- a/chrome/browser/tab_restore_browsertest.cc +++ b/chrome/browser/tab_restore_browsertest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" @@ -63,11 +64,11 @@ class TabRestoreTest : public InProcessBrowserTest { } void CloseTab(int index) { - content::WebContents* new_tab = browser()->GetWebContentsAt(index); + content::WebContents* new_tab = chrome::GetWebContentsAt(browser(), index); ui_test_utils::WindowedNotificationObserver tab_close_observer( content::NOTIFICATION_WEB_CONTENTS_DESTROYED, content::NotificationService::AllSources()); - browser()->CloseTabContents(new_tab); + chrome::CloseWebContents(browser(), new_tab); tab_close_observer.Wait(); } @@ -161,7 +162,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, Basic) { // And make sure everything looks right. EXPECT_EQ(starting_tab_count + 1, browser()->tab_count()); EXPECT_EQ(closed_tab_index, browser()->active_index()); - EXPECT_EQ(url1_, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url1_, chrome::GetActiveWebContents(browser())->GetURL()); } // Close a tab not at the end of the current window, then restore it. The tab @@ -180,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, MiddleTab) { // And make sure everything looks right. EXPECT_EQ(starting_tab_count + 3, browser()->tab_count()); EXPECT_EQ(closed_tab_index, browser()->active_index()); - EXPECT_EQ(url1_, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url1_, chrome::GetActiveWebContents(browser())->GetURL()); } // Close a tab, switch windows, then restore the tab. The tab should be in its @@ -206,7 +207,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreToDifferentWindow) { // And make sure everything looks right. EXPECT_EQ(starting_tab_count + 3, browser()->tab_count()); EXPECT_EQ(closed_tab_index, browser()->active_index()); - EXPECT_EQ(url1_, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url1_, chrome::GetActiveWebContents(browser())->GetURL()); } // Close a tab, open a new window, close the first window, then restore the @@ -234,7 +235,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, FLAKY_BasicRestoreFromClosedWindow) { // Tab should be in a new window. Browser* browser = GetBrowser(1); - content::WebContents* web_contents = browser->GetActiveWebContents(); + content::WebContents* web_contents = chrome::GetActiveWebContents(browser); // And make sure the URLs matches. EXPECT_EQ(url2_, web_contents->GetURL()); GoBack(browser); @@ -294,7 +295,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindowAndTab) { // Restore the closed tab. ASSERT_NO_FATAL_FAILURE(RestoreTab(1, closed_tab_index)); EXPECT_EQ(starting_tab_count + 3, browser->tab_count()); - EXPECT_EQ(url1_, browser->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url1_, chrome::GetActiveWebContents(browser)->GetURL()); } // Open a window with two tabs, close both (closing the window), then restore @@ -330,12 +331,12 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreIntoSameWindow) { ASSERT_NO_FATAL_FAILURE(RestoreTab(1, 0)); Browser* browser = GetBrowser(1); EXPECT_EQ(1, browser->tab_count()); - EXPECT_EQ(url2_, browser->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url2_, chrome::GetActiveWebContents(browser)->GetURL()); // Restore the next-to-last-closed tab into the same window. ASSERT_NO_FATAL_FAILURE(RestoreTab(1, 0)); EXPECT_EQ(2, browser->tab_count()); - EXPECT_EQ(url1_, browser->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url1_, chrome::GetActiveWebContents(browser)->GetURL()); } // Tests that a duplicate history entry is not created when we restore a page @@ -354,7 +355,8 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWithExistingSiteInstance) { EXPECT_EQ(++tab_count, browser()->tab_count()); // Navigate to another same-site URL. - content::WebContents* tab = browser()->GetWebContentsAt(tab_count - 1); + content::WebContents* tab = + chrome::GetWebContentsAt(browser(), tab_count - 1); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); @@ -378,9 +380,9 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWithExistingSiteInstance) { ASSERT_NO_FATAL_FAILURE(RestoreTab(0, tab_count - 1)); // And make sure the URLs match. - EXPECT_EQ(http_url2, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(http_url2, chrome::GetActiveWebContents(browser())->GetURL()); GoBack(browser()); - EXPECT_EQ(http_url1, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(http_url1, chrome::GetActiveWebContents(browser())->GetURL()); } // Tests that the SiteInstances used for entries in a restored tab's history @@ -426,9 +428,9 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, ASSERT_NO_FATAL_FAILURE(RestoreTab(0, tab_count - 1)); // And make sure the URLs match. - EXPECT_EQ(url1_, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url1_, chrome::GetActiveWebContents(browser())->GetURL()); GoBack(browser()); - EXPECT_EQ(http_url1, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(http_url1, chrome::GetActiveWebContents(browser())->GetURL()); // Navigating to a new URL should clear the forward list, because the max // page ID of the renderer should have been updated when we restored the tab. @@ -436,7 +438,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, browser(), http_url2, CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); EXPECT_FALSE(chrome::CanGoForward(browser())); - EXPECT_EQ(http_url2, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(http_url2, chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) { @@ -480,11 +482,11 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreWindow) { load_stop_observer.Wait(); content::WebContents* restored_tab = - browser->GetWebContentsAt(initial_tab_count); + chrome::GetWebContentsAt(browser, initial_tab_count); EnsureTabFinishedRestoring(restored_tab); EXPECT_EQ(url1_, restored_tab->GetURL()); - restored_tab = browser->GetWebContentsAt(initial_tab_count + 1); + restored_tab = chrome::GetWebContentsAt(browser, initial_tab_count + 1); EnsureTabFinishedRestoring(restored_tab); EXPECT_EQ(url2_, restored_tab->GetURL()); } @@ -502,7 +504,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreTabWithSpecialURL) { // Restore the closed tab. ASSERT_NO_FATAL_FAILURE(RestoreTab(0, 1)); - TabContents* tab = browser()->GetTabContentsAt(1); + TabContents* tab = chrome::GetTabContentsAt(browser(), 1); EnsureTabFinishedRestoring(tab->web_contents()); // See if content is as expected. @@ -531,7 +533,7 @@ IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreTabWithSpecialURLOnBack) { // Restore the closed tab. ASSERT_NO_FATAL_FAILURE(RestoreTab(0, 1)); - TabContents* tab = browser()->GetTabContentsAt(1); + TabContents* tab = chrome::GetTabContentsAt(browser(), 1); EnsureTabFinishedRestoring(tab->web_contents()); ASSERT_EQ(http_url, tab->web_contents()->GetURL()); diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 9ec8186..9a50042 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -21,6 +21,7 @@ #include "chrome/browser/task_manager/task_manager_browsertest_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.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/tabs/tab_strip_model.h" @@ -103,9 +104,10 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) { ASSERT_TRUE(StartsWith(model()->GetResourceTitle(2), prefix, true)); // Close the tab and verify that we notice. - WebContents* first_tab = browser()->GetTabContentsAt(0)->web_contents(); + WebContents* first_tab = + chrome::GetTabContentsAt(browser(), 0)->web_contents(); ASSERT_TRUE(first_tab); - browser()->CloseTabContents(first_tab); + chrome::CloseWebContents(browser(), first_tab); TaskManagerBrowserTestUtil::WaitForResourceChange(2); } @@ -394,7 +396,7 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, // manager is still visible. Make sure we don't crash and the extension // gets reloaded and noticed in the task manager. InfoBarTabHelper* infobar_helper = - browser()->GetActiveTabContents()->infobar_tab_helper(); + chrome::GetActiveTabContents(browser())->infobar_tab_helper(); ASSERT_EQ(1U, infobar_helper->infobar_count()); ConfirmInfoBarDelegate* delegate = infobar_helper-> GetInfoBarDelegateAt(0)->AsConfirmInfoBarDelegate(); diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 96391c4..624fef1 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -27,6 +27,7 @@ #include "chrome/browser/translate/translate_tab_helper.h" #include "chrome/browser/ui/browser.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/tabs/tab_strip_model.h" #include "chrome/common/chrome_notification_types.h" @@ -679,8 +680,8 @@ void TranslateManager::ReportLanguageDetectionError(WebContents* web_contents) { NOTREACHED(); return; } - browser->AddSelectedTabWithURL(GURL(report_error_url), - content::PAGE_TRANSITION_AUTO_BOOKMARK); + chrome::AddSelectedTabWithURL(browser, GURL(report_error_url), + content::PAGE_TRANSITION_AUTO_BOOKMARK); } void TranslateManager::DoTranslatePage(WebContents* web_contents, diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 7157b87..eca0b18 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -103,6 +103,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_toolbar_model_delegate.h" #include "chrome/browser/ui/browser_ui_prefs.h" #include "chrome/browser/ui/browser_window.h" @@ -504,7 +505,7 @@ FindBarController* Browser::GetFindBarController() { FindBar* find_bar = window_->CreateFindBar(); find_bar_controller_.reset(new FindBarController(find_bar)); find_bar->SetFindBarController(find_bar_controller_.get()); - find_bar_controller_->ChangeTabContents(GetActiveTabContents()); + find_bar_controller_->ChangeTabContents(chrome::GetActiveTabContents(this)); find_bar_controller_->find_bar()->MoveWindowIfNecessary(gfx::Rect(), true); } return find_bar_controller_.get(); @@ -526,14 +527,14 @@ bool Browser::is_devtools() const { // Browser, State Storage and Retrieval for UI: SkBitmap Browser::GetCurrentPageIcon() const { - TabContents* contents = GetActiveTabContents(); + TabContents* contents = chrome::GetActiveTabContents(this); // |contents| can be NULL since GetCurrentPageIcon() is called by the window // during the window's creation (before tabs have been added). return contents ? contents->favicon_tab_helper()->GetFavicon() : SkBitmap(); } string16 Browser::GetWindowTitleForCurrentTab() const { - WebContents* contents = GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(this); string16 title; // |contents| can be NULL because GetWindowTitleForCurrentTab is called by the @@ -629,13 +630,13 @@ void Browser::OnWindowClosing() { content::Source<Browser>(this), content::Details<bool>(&exiting)); - CloseAllTabs(); + chrome::CloseAllTabs(this); } void Browser::OnWindowActivated() { // On some platforms we want to automatically reload tabs that are // killed when the user selects them. - WebContents* contents = GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(this); if (contents && contents->GetCrashedStatus() == base::TERMINATION_STATUS_PROCESS_WAS_KILLED) { if (CommandLine::ForCurrentProcess()->HasSwitch( @@ -733,163 +734,9 @@ int Browser::active_index() const { return tab_strip_model_->active_index(); } -int Browser::GetIndexOfController( - const NavigationController* controller) const { - return tab_strip_model_->GetIndexOfController(controller); -} - -TabContents* Browser::GetActiveTabContents() const { - return tab_strip_model_->GetActiveTabContents(); -} - -WebContents* Browser::GetActiveWebContents() const { - TabContents* tab_contents = GetActiveTabContents(); - return tab_contents ? tab_contents->web_contents() : NULL; -} - -TabContents* Browser::GetTabContentsAt(int index) const { - return tab_strip_model_->GetTabContentsAt(index); -} - -WebContents* Browser::GetWebContentsAt(int index) const { - TabContents* tab_contents = GetTabContentsAt(index); - if (tab_contents) - return tab_contents->web_contents(); - return NULL; -} - -void Browser::ActivateTabAt(int index, bool user_gesture) { - tab_strip_model_->ActivateTabAt(index, user_gesture); -} - -bool Browser::IsTabPinned(int index) const { - return tab_strip_model_->IsTabPinned(index); -} - -bool Browser::IsTabDiscarded(int index) const { - return tab_strip_model_->IsTabDiscarded(index); -} - -void Browser::CloseAllTabs() { - tab_strip_model_->CloseAllTabs(); -} - //////////////////////////////////////////////////////////////////////////////// // Browser, Tab adding/showing functions: -bool Browser::IsTabStripEditable() const { - return window()->IsTabStripEditable(); -} - -int Browser::GetIndexForInsertionDuringRestore(int relative_index) { - return (tab_strip_model_->insertion_policy() == TabStripModel::INSERT_AFTER) ? - tab_count() : relative_index; -} - -TabContents* Browser::AddSelectedTabWithURL( - const GURL& url, - content::PageTransition transition) { - browser::NavigateParams params(this, url, transition); - params.disposition = NEW_FOREGROUND_TAB; - browser::Navigate(¶ms); - return params.target_contents; -} - -WebContents* Browser::AddTab(TabContents* tab_contents, - content::PageTransition type) { - tab_strip_model_->AddTabContents(tab_contents, -1, type, - TabStripModel::ADD_ACTIVE); - return tab_contents->web_contents(); -} - -WebContents* Browser::AddRestoredTab( - const std::vector<TabNavigation>& navigations, - int tab_index, - int selected_navigation, - const std::string& extension_app_id, - bool select, - bool pin, - bool from_last_session, - content::SessionStorageNamespace* session_storage_namespace) { - GURL restore_url = navigations.at(selected_navigation).virtual_url(); - TabContents* tab_contents = TabContentsFactory( - profile(), - tab_util::GetSiteInstanceForNewTab(profile_, restore_url), - MSG_ROUTING_NONE, - GetActiveWebContents(), - session_storage_namespace); - WebContents* new_tab = tab_contents->web_contents(); - tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id); - std::vector<NavigationEntry*> entries; - TabNavigation::CreateNavigationEntriesFromTabNavigations( - profile_, navigations, &entries); - new_tab->GetController().Restore( - selected_navigation, from_last_session, &entries); - DCHECK_EQ(0u, entries.size()); - - int add_types = select ? TabStripModel::ADD_ACTIVE : - TabStripModel::ADD_NONE; - if (pin) { - int first_mini_tab_idx = tab_strip_model_->IndexOfFirstNonMiniTab(); - tab_index = std::min(tab_index, first_mini_tab_idx); - add_types |= TabStripModel::ADD_PINNED; - } - tab_strip_model_->InsertTabContentsAt(tab_index, tab_contents, add_types); - if (select) { - window_->Activate(); - } else { - // We set the size of the view here, before WebKit does its initial - // layout. If we don't, the initial layout of background tabs will be - // performed with a view width of 0, which may cause script outputs and - // anchor link location calculations to be incorrect even after a new - // layout with proper view dimensions. TabStripModel::AddTabContents() - // contains similar logic. - new_tab->GetView()->SizeContents(window_->GetRestoredBounds().size()); - new_tab->WasHidden(); - } - SessionService* session_service = - SessionServiceFactory::GetForProfileIfExisting(profile_); - if (session_service) - session_service->TabRestored(tab_contents, pin); - return new_tab; -} - -void Browser::AddWebContents(WebContents* new_contents, - WindowOpenDisposition disposition, - const gfx::Rect& initial_pos, - bool user_gesture) { - AddNewContents(NULL, new_contents, disposition, initial_pos, user_gesture); -} - -void Browser::CloseTabContents(WebContents* contents) { - CloseContents(contents); -} - -void Browser::ReplaceRestoredTab( - const std::vector<TabNavigation>& navigations, - int selected_navigation, - bool from_last_session, - const std::string& extension_app_id, - content::SessionStorageNamespace* session_storage_namespace) { - GURL restore_url = navigations.at(selected_navigation).virtual_url(); - TabContents* tab_contents = TabContentsFactory( - profile(), - tab_util::GetSiteInstanceForNewTab(profile_, restore_url), - MSG_ROUTING_NONE, - GetActiveWebContents(), - session_storage_namespace); - tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id); - WebContents* replacement = tab_contents->web_contents(); - std::vector<NavigationEntry*> entries; - TabNavigation::CreateNavigationEntriesFromTabNavigations( - profile_, navigations, &entries); - replacement->GetController().Restore( - selected_navigation, from_last_session, &entries); - DCHECK_EQ(0u, entries.size()); - - tab_strip_model_->ReplaceNavigationControllerAt(active_index(), tab_contents); -} - void Browser::WindowFullscreenStateChanged() { fullscreen_controller_->WindowFullscreenStateChanged(); command_controller_->FullscreenStateChanged(); @@ -929,7 +776,7 @@ void Browser::ToggleEncodingAutoDetect() { // OTOH, if "auto detect" is turned off, we don't change the currently // active encoding. if (encoding_auto_detect_.GetValue()) { - WebContents* contents = GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(this); if (contents) contents->ResetOverrideEncoding(); } @@ -939,7 +786,7 @@ void Browser::OverrideEncoding(int encoding_id) { content::RecordAction(UserMetricsAction("OverrideEncoding")); const std::string selected_encoding = CharacterEncoding::GetCanonicalEncodingNameByCommandId(encoding_id); - WebContents* contents = GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(this); if (!selected_encoding.empty() && contents) contents->SetOverrideEncoding(selected_encoding); // Update the list of recently selected encodings. @@ -965,14 +812,14 @@ void Browser::OpenFile() { select_file_dialog_->SelectFile(SelectFileDialog::SELECT_OPEN_FILE, string16(), directory, NULL, 0, FILE_PATH_LITERAL(""), - GetActiveWebContents(), + chrome::GetActiveWebContents(this), parent_window, NULL); } void Browser::OpenCreateShortcutsDialog() { content::RecordAction(UserMetricsAction("CreateShortcut")); #if !defined(OS_MACOSX) - TabContents* current_tab = GetActiveTabContents(); + TabContents* current_tab = chrome::GetActiveTabContents(this); DCHECK(current_tab && web_app::IsValidUrl(current_tab->web_contents()->GetURL())) << "Menu item should be disabled."; @@ -1139,7 +986,7 @@ void Browser::UpdateUIForNavigationInTab(TabContents* contents, bool user_initiated) { tab_strip_model_->TabNavigating(contents, transition); - bool contents_is_selected = contents == GetActiveTabContents(); + bool contents_is_selected = contents == chrome::GetActiveTabContents(this); if (user_initiated && contents_is_selected && window()->GetLocationBar()) { // Forcibly reset the location bar if the url is going to change in the // current tab, since otherwise it won't discard any ongoing user edits, @@ -1169,21 +1016,6 @@ WebContents* Browser::OpenURL(const OpenURLParams& params) { return OpenURLFromTab(NULL, params); } -// Centralized method for creating a TabContents, configuring and -// installing all its supporting objects and observers. -TabContents* Browser::TabContentsFactory( - Profile* profile, - SiteInstance* site_instance, - int routing_id, - const WebContents* base_web_contents, - content::SessionStorageNamespace* session_storage_namespace) { - WebContents* new_contents = WebContents::Create( - profile, site_instance, routing_id, base_web_contents, - session_storage_namespace); - TabContents* tab_contents = new TabContents(new_contents); - return tab_contents; -} - /////////////////////////////////////////////////////////////////////////////// // Browser, TabStripModelDelegate implementation: @@ -1239,8 +1071,8 @@ TabContents* Browser::CreateTabContentsForURL( const GURL& url, const content::Referrer& referrer, Profile* profile, content::PageTransition transition, bool defer_load, SiteInstance* instance) const { - TabContents* contents = TabContentsFactory(profile, instance, - MSG_ROUTING_NONE, GetActiveWebContents(), NULL); + TabContents* contents = chrome::TabContentsFactory(profile, instance, + MSG_ROUTING_NONE, chrome::GetActiveWebContents(this), NULL); if (!defer_load) { // Load the initial URL before adding the new tab contents to the tab strip // so that the tab contents has navigation state. @@ -1252,12 +1084,13 @@ TabContents* Browser::CreateTabContentsForURL( } bool Browser::CanDuplicateContentsAt(int index) { - NavigationController& nc = GetWebContentsAt(index)->GetController(); + NavigationController& nc = + chrome::GetWebContentsAt(this, index)->GetController(); return nc.GetWebContents() && nc.GetLastCommittedEntry(); } void Browser::DuplicateContentsAt(int index) { - TabContents* contents = GetTabContentsAt(index); + TabContents* contents = chrome::GetTabContentsAt(this, index); CHECK(contents); TabContents* contents_dupe = contents->Clone(); @@ -1266,7 +1099,7 @@ void Browser::DuplicateContentsAt(int index) { // If this is a tabbed browser, just create a duplicate tab inside the same // window next to the tab being duplicated. int index = tab_strip_model_->GetIndexOfTabContents(contents); - pinned = IsTabPinned(index); + pinned = tab_strip_model_->IsTabPinned(index); int add_types = TabStripModel::ADD_ACTIVE | TabStripModel::ADD_INHERIT_GROUP | (pinned ? TabStripModel::ADD_PINNED : 0); @@ -1295,7 +1128,7 @@ void Browser::DuplicateContentsAt(int index) { browser->window()->Show(); // The page transition below is only for the purpose of inserting the tab. - browser->AddTab(contents_dupe, content::PAGE_TRANSITION_LINK); + chrome::AddTab(browser, contents_dupe, content::PAGE_TRANSITION_LINK); } SessionService* session_service = @@ -1433,7 +1266,7 @@ void Browser::ActiveTabChanged(TabContents* old_contents, } // Discarded tabs always get reloaded. - if (!did_reload && IsTabDiscarded(index)) { + if (!did_reload && tab_strip_model_->IsTabDiscarded(index)) { LOG(WARNING) << "Reloading discarded tab at " << index; static int reload_count = 0; UMA_HISTOGRAM_CUSTOM_COUNTS( @@ -1465,7 +1298,7 @@ void Browser::ActiveTabChanged(TabContents* old_contents, // Show the loading state (if any). status_bubble->SetStatus( - GetActiveTabContents()->core_tab_helper()->GetStatusText()); + chrome::GetActiveTabContents(this)->core_tab_helper()->GetStatusText()); } if (HasFindBarController()) { @@ -1514,7 +1347,8 @@ void Browser::TabReplacedAt(TabStripModel* tab_strip_model, if (session_service) { // The new_contents may end up with a different navigation stack. Force // the session service to update itself. - session_service->TabRestored(new_contents, IsTabPinned(index)); + session_service->TabRestored(new_contents, + tab_strip_model_->IsTabPinned(index)); } content::DevToolsManager::GetInstance()->ContentsReplaced( @@ -1527,8 +1361,9 @@ void Browser::TabPinnedStateChanged(TabContents* contents, int index) { if (session_service) { session_service->SetPinnedState( session_id(), - GetTabContentsAt(index)->restore_tab_helper()->session_id(), - IsTabPinned(index)); + chrome::GetTabContentsAt(this, index)->restore_tab_helper()-> + session_id(), + tab_strip_model_->IsTabPinned(index)); } } @@ -1574,7 +1409,7 @@ void Browser::OnDenyFullscreenPermission(FullscreenExitBubbleType bubble_type) { bool Browser::TabsNeedBeforeUnloadFired() { if (tabs_needing_before_unload_fired_.empty()) { for (int i = 0; i < tab_count(); ++i) { - WebContents* contents = GetTabContentsAt(i)->web_contents(); + WebContents* contents = chrome::GetTabContentsAt(this, i)->web_contents(); if (contents->NeedToFireBeforeUnload()) tabs_needing_before_unload_fired_.insert(contents); } @@ -1635,7 +1470,7 @@ BrowserWindow* Browser::CreateBrowserWindow() { WebContents* Browser::OpenURLFromTab(WebContents* source, const OpenURLParams& params) { browser::NavigateParams nav_params(this, params.url, params.transition); - nav_params.source_contents = GetTabContentsAt( + nav_params.source_contents = chrome::GetTabContentsAt(this, tab_strip_model_->GetIndexOfWebContents(source)); nav_params.referrer = params.referrer; nav_params.disposition = params.disposition; @@ -1672,59 +1507,13 @@ void Browser::AddNewContents(WebContents* source, WindowOpenDisposition disposition, const gfx::Rect& initial_pos, bool user_gesture) { - // No code for this yet. - DCHECK(disposition != SAVE_TO_DISK); - // Can't create a new contents for the current tab - invalid case. - DCHECK(disposition != CURRENT_TAB); - - TabContents* source_tab_contents = NULL; - BlockedContentTabHelper* source_blocked_content = NULL; - TabContents* new_tab_contents = TabContents::FromWebContents(new_contents); - if (!new_tab_contents) { - new_tab_contents = new TabContents(new_contents); - } - if (source) { - source_tab_contents = TabContents::FromWebContents(source); - source_blocked_content = source_tab_contents->blocked_content_tab_helper(); - } - - if (source_tab_contents) { - // Handle blocking of all contents. - if (source_blocked_content->all_contents_blocked()) { - source_blocked_content->AddTabContents(new_tab_contents, - disposition, - initial_pos, - user_gesture); - return; - } - - // Handle blocking of popups. - if ((disposition == NEW_POPUP) && !user_gesture && - !CommandLine::ForCurrentProcess()->HasSwitch( - switches::kDisablePopupBlocking)) { - // Unrequested popups from normal pages are constrained unless they're in - // the whitelist. The popup owner will handle checking this. - GetConstrainingTabContents(source_tab_contents)-> - blocked_content_tab_helper()-> - AddPopup(new_tab_contents, initial_pos, user_gesture); - return; - } - - new_contents->GetRenderViewHost()->DisassociateFromPopupCount(); - } - - browser::NavigateParams params(this, new_tab_contents); - params.source_contents = source ? - GetTabContentsAt(tab_strip_model_->GetIndexOfWebContents(source)): NULL; - params.disposition = disposition; - params.window_bounds = initial_pos; - params.window_action = browser::NavigateParams::SHOW_WINDOW; - params.user_gesture = user_gesture; - browser::Navigate(¶ms); + chrome::AddWebContents(this, source, new_contents, disposition, initial_pos, + user_gesture); } void Browser::ActivateContents(WebContents* contents) { - ActivateTabAt(tab_strip_model_->GetIndexOfWebContents(contents), false); + chrome::ActivateTabAt(this, tab_strip_model_->GetIndexOfWebContents(contents), + false); window_->Activate(); } @@ -1736,13 +1525,14 @@ void Browser::LoadingStateChanged(WebContents* source) { window_->UpdateLoadingAnimations(tab_strip_model_->TabsAreLoading()); window_->UpdateTitleBar(); - WebContents* selected_contents = GetActiveWebContents(); + WebContents* selected_contents = chrome::GetActiveWebContents(this); if (source == selected_contents) { bool is_loading = source->IsLoading(); command_controller_->LoadingStateChanged(is_loading, false); if (GetStatusBubble()) { GetStatusBubble()->SetStatus( - GetActiveTabContents()->core_tab_helper()->GetStatusText()); + chrome::GetActiveTabContents(this)->core_tab_helper()-> + GetStatusText()); } if (!is_loading && pending_web_app_action_ == UPDATE_SHORTCUT) { @@ -1771,13 +1561,7 @@ void Browser::CloseContents(WebContents* source) { return; } - int index = tab_strip_model_->GetIndexOfWebContents(source); - if (index == TabStripModel::kNoTab) { - NOTREACHED() << "CloseContents called for tab not in our strip"; - return; - } - tab_strip_model_->CloseTabContentsAt(index, - TabStripModel::CLOSE_CREATE_HISTORICAL_TAB); + chrome::CloseWebContents(this, source); } void Browser::MoveContents(WebContents* source, const gfx::Rect& pos) { @@ -1798,7 +1582,7 @@ void Browser::UpdateTargetURL(WebContents* source, int32 page_id, if (!GetStatusBubble()) return; - if (source == GetActiveWebContents()) { + if (source == chrome::GetActiveWebContents(this)) { PrefService* prefs = profile_->GetPrefs(); GetStatusBubble()->SetURL(url, prefs->GetString(prefs::kAcceptLanguages)); } @@ -1809,7 +1593,7 @@ void Browser::ContentsMouseEvent( if (!GetStatusBubble()) return; - if (source == GetActiveWebContents()) { + if (source == chrome::GetActiveWebContents(this)) { GetStatusBubble()->MouseMoved(location, !motion); if (!motion) GetStatusBubble()->SetURL(GURL(), std::string()); @@ -1915,7 +1699,7 @@ void Browser::OnStartDownload(WebContents* source, // Panels. // Don't show the animation if the selected tab is not visible (i.e. the // window is minimized, we're in a unit test, etc.). - WebContents* shelf_tab = shelf->browser()->GetActiveWebContents(); + WebContents* shelf_tab = chrome::GetActiveWebContents(shelf->browser()); if ((download->GetTotalBytes() > 0) && !download_crx_util::IsExtensionDownload(*download) && platform_util::IsVisible(shelf_tab->GetNativeView()) && @@ -1930,7 +1714,7 @@ void Browser::OnStartDownload(WebContents* source, void Browser::ViewSourceForTab(WebContents* source, const GURL& page_url) { DCHECK(source); - TabContents* tab_contents = GetTabContentsAt( + TabContents* tab_contents = chrome::GetTabContentsAt(this, tab_strip_model_->GetIndexOfWebContents(source)); chrome::ViewSource(this, tab_contents); } @@ -1939,7 +1723,7 @@ void Browser::ViewSourceForFrame(WebContents* source, const GURL& frame_url, const std::string& frame_content_state) { DCHECK(source); - TabContents* tab_contents = GetTabContentsAt( + TabContents* tab_contents = chrome::GetTabContentsAt(this, tab_strip_model_->GetIndexOfWebContents(source)); chrome::ViewSource(this, tab_contents, frame_url, frame_content_state); } @@ -2033,12 +1817,12 @@ void Browser::WorkerCrashed(WebContents* source) { } void Browser::DidNavigateMainFramePostCommit(WebContents* web_contents) { - if (web_contents == GetActiveWebContents()) + if (web_contents == chrome::GetActiveWebContents(this)) UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); } void Browser::DidNavigateToPendingEntry(WebContents* web_contents) { - if (web_contents == GetActiveWebContents()) + if (web_contents == chrome::GetActiveWebContents(this)) UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE); } @@ -2123,7 +1907,7 @@ void Browser::WebIntentDispatch( if (!web_contents) { // Intent is system-caused and the picker will show over the currently // active web contents. - web_contents = GetActiveWebContents(); + web_contents = chrome::GetActiveWebContents(this); } TabContents* tab_contents = TabContents::FromWebContents(web_contents); tab_contents->web_intent_picker_controller()->SetIntentsDispatcher( @@ -2232,7 +2016,7 @@ void Browser::SetTabContentBlocked(TabContents* tab_contents, bool blocked) { } tab_strip_model_->SetTabBlocked(index, blocked); command_controller_->PrintingStateChanged(); - if (!blocked && GetActiveTabContents() == tab_contents) + if (!blocked && chrome::GetActiveTabContents(this) == tab_contents) tab_contents->web_contents()->Focus(); } @@ -2247,7 +2031,7 @@ TabContents* Browser::GetConstrainingTabContents(TabContents* source) { // Browser, BookmarkTabHelperDelegate implementation: void Browser::URLStarredChanged(TabContents* source, bool starred) { - if (source == GetActiveTabContents()) + if (source == chrome::GetActiveTabContents(this)) window_->SetStarredState(starred); } @@ -2256,14 +2040,14 @@ void Browser::URLStarredChanged(TabContents* source, bool starred) { void Browser::OnZoomIconChanged(TabContents* source, ZoomController::ZoomIconState state) { - if (source == GetActiveTabContents()) + if (source == chrome::GetActiveTabContents(this)) window_->SetZoomIconState(state); } void Browser::OnZoomChanged(TabContents* source, int zoom_percent, bool can_show_bubble) { - if (source == GetActiveTabContents()) { + if (source == chrome::GetActiveTabContents(this)) { window_->SetZoomIconTooltipPercent(zoom_percent); // Only show the zoom bubble for zoom changes in the active window. @@ -2277,7 +2061,7 @@ void Browser::OnZoomChanged(TabContents* source, void Browser::OnDidGetApplicationInfo(TabContents* source, int32 page_id) { - if (GetActiveTabContents() != source) + if (chrome::GetActiveTabContents(this) != source) return; NavigationEntry* entry = @@ -2357,8 +2141,8 @@ void Browser::Observe(int type, // (NavigationControllers) for convenience, so the notification could // actually be for a different window while we're doing asynchronous // closing of this one. - if (GetActiveWebContents() && - &GetActiveWebContents()->GetController() == + if (chrome::GetActiveWebContents(this) && + &chrome::GetActiveWebContents(this)->GetController() == content::Source<NavigationController>(source).ptr()) UpdateToolbar(false); break; @@ -2375,8 +2159,7 @@ void Browser::Observe(int type, content::Details<extensions::UnloadedExtensionInfo>( details)->extension; for (int i = tab_strip_model_->count() - 1; i >= 0; --i) { - WebContents* tc = - tab_strip_model_->GetTabContentsAt(i)->web_contents(); + WebContents* tc = chrome::GetTabContentsAt(this, i)->web_contents(); bool close_tab_contents = tc->GetURL().SchemeIs(chrome::kExtensionScheme) && tc->GetURL().host() == extension->id(); @@ -2385,9 +2168,8 @@ void Browser::Observe(int type, (type_ == TYPE_PANEL && (web_app::GetExtensionIdFromApplicationName(app_name_) == extension->id())); - if (close_tab_contents) { - CloseTabContents(tc); - } + if (close_tab_contents) + chrome::CloseWebContents(this, tc); } } break; @@ -2446,7 +2228,7 @@ void Browser::Observe(int type, case chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED: { WebContents* web_contents = content::Source<WebContents>(source).ptr(); - if (web_contents == GetActiveWebContents()) { + if (web_contents == chrome::GetActiveWebContents(this)) { LocationBar* location_bar = window()->GetLocationBar(); if (location_bar) location_bar->UpdateContentSettingsIcons(); @@ -2475,20 +2257,20 @@ void Browser::ShowInstant(TabContents* preview_contents) { // TODO(beng): investigate if we can avoid this and instead rely on the // visibility of the WebContentsView - GetActiveWebContents()->WasHidden(); + chrome::GetActiveWebContents(this)->WasHidden(); preview_contents->web_contents()->WasRestored(); } void Browser::HideInstant() { window_->HideInstant(); - if (GetActiveWebContents()) - GetActiveWebContents()->WasRestored(); + if (chrome::GetActiveWebContents(this)) + chrome::GetActiveWebContents(this)->WasRestored(); if (instant_->GetPreviewContents()) instant_->GetPreviewContents()->web_contents()->WasHidden(); } void Browser::CommitInstant(TabContents* preview_contents) { - TabContents* tab_contents = GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(this); int index = tab_strip_model_->GetIndexOfTabContents(tab_contents); DCHECK_NE(TabStripModel::kNoTab, index); // TabStripModel takes ownership of preview_contents. @@ -2520,7 +2302,7 @@ void Browser::InstantPreviewFocused() { } TabContents* Browser::GetInstantHostTabContents() const { - return GetActiveTabContents(); + return chrome::GetActiveTabContents(this); } /////////////////////////////////////////////////////////////////////////////// @@ -2534,7 +2316,8 @@ void Browser::MarkHomePageAsChanged(PrefService* pref_service) { // Browser, UI update coalescing and handling (private): void Browser::UpdateToolbar(bool should_restore_state) { - window_->UpdateToolbar(GetActiveTabContents(), should_restore_state); + window_->UpdateToolbar(chrome::GetActiveTabContents(this), + should_restore_state); } void Browser::UpdateSearchState(TabContents* contents) { @@ -2549,7 +2332,7 @@ void Browser::ScheduleUIUpdate(const WebContents* source, // Do some synchronous updates. if (changed_flags & content::INVALIDATE_TYPE_URL && - source == GetActiveWebContents()) { + source == chrome::GetActiveWebContents(this)) { // Only update the URL for the current tab. Note that we do not update // the navigation commands since those would have already been updated // synchronously by NavigationStateChanged. @@ -2561,7 +2344,7 @@ void Browser::ScheduleUIUpdate(const WebContents* source, // immediately start/stop, which gives a more snappy feel. We want to do // this for any tab so they start & stop quickly. tab_strip_model_->UpdateTabContentsStateAt( - GetIndexOfController(&source->GetController()), + chrome::GetIndexOfTab(this, source), TabStripModelObserver::LOADING_ONLY); // The status bubble needs to be updated during INVALIDATE_TYPE_LOAD too, // but we do that asynchronously by not stripping INVALIDATE_TYPE_LOAD from @@ -2574,7 +2357,7 @@ void Browser::ScheduleUIUpdate(const WebContents* source, // the TabStripModel, so we notify the TabStripModel now and notify others // asynchronously. tab_strip_model_->UpdateTabContentsStateAt( - GetIndexOfController(&source->GetController()), + chrome::GetIndexOfTab(this, source), TabStripModelObserver::TITLE_NOT_LOADING); } @@ -2604,7 +2387,7 @@ void Browser::ProcessPendingUIUpdates() { i != scheduled_updates_.end(); ++i) { bool found = false; for (int tab = 0; tab < tab_count(); tab++) { - if (GetWebContentsAt(tab) == i->first) { + if (chrome::GetWebContentsAt(this, tab) == i->first) { found = true; break; } @@ -2621,7 +2404,7 @@ void Browser::ProcessPendingUIUpdates() { const WebContents* contents = i->first; unsigned flags = i->second; - if (contents == GetActiveWebContents()) { + if (contents == chrome::GetActiveWebContents(this)) { // Updates that only matter when the tab is selected go here. if (flags & content::INVALIDATE_TYPE_PAGE_ACTIONS) { @@ -2631,9 +2414,8 @@ void Browser::ProcessPendingUIUpdates() { } // Updating the URL happens synchronously in ScheduleUIUpdate. if (flags & content::INVALIDATE_TYPE_LOAD && GetStatusBubble()) { - GetStatusBubble()->SetStatus( - GetActiveTabContents()-> - core_tab_helper()->GetStatusText()); + GetStatusBubble()->SetStatus(chrome::GetActiveTabContents(this)-> + core_tab_helper()->GetStatusText()); } if (flags & (content::INVALIDATE_TYPE_TAB | @@ -2684,14 +2466,14 @@ void Browser::SyncHistoryWithTabs(int index) { SessionServiceFactory::GetForProfileIfExisting(profile()); if (session_service) { for (int i = index; i < tab_count(); ++i) { - TabContents* tab = GetTabContentsAt(i); + TabContents* tab = chrome::GetTabContentsAt(this, i); if (tab) { session_service->SetTabIndexInWindow( session_id(), tab->restore_tab_helper()->session_id(), i); session_service->SetPinnedState( session_id(), tab->restore_tab_helper()->session_id(), - IsTabPinned(i)); + tab_strip_model_->IsTabPinned(i)); } } } @@ -2845,7 +2627,7 @@ void Browser::TabDetachedAtImpl(TabContents* contents, int index, // is the selected tab. Because saving state can conditionally revert the // location bar, saving the current tab's location bar state to a // non-selected tab can corrupt both tabs. - if (contents == GetActiveTabContents()) { + if (contents == chrome::GetActiveTabContents(this)) { LocationBar* location_bar = window()->GetLocationBar(); if (location_bar) location_bar->SaveStateToContents(contents->web_contents()); @@ -2928,7 +2710,7 @@ void Browser::UpdateBookmarkBarState(BookmarkBarStateChangeReason reason) { (!window_ || !window_->IsFullscreen())) { state = BookmarkBar::SHOW; } else { - TabContents* tab = GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(this); if (tab && tab->bookmark_tab_helper()->ShouldShowBookmarkBar()) state = BookmarkBar::DETACHED; else diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index 5e5ae3c..c5da158 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -351,79 +351,6 @@ class Browser : public TabStripModelDelegate, int tab_count() const; int active_index() const; - int GetIndexOfController( - const content::NavigationController* controller) const; - - TabContents* GetActiveTabContents() const; - // A convenient version of the above which returns the TabContents's - // WebContents. - content::WebContents* GetActiveWebContents() const; - TabContents* GetTabContentsAt(int index) const; - // A convenient version of the above which returns the TabContents's - // WebContents. - content::WebContents* GetWebContentsAt(int index) const; - void ActivateTabAt(int index, bool user_gesture); - bool IsTabPinned(int index) const; - bool IsTabDiscarded(int index) const; - void CloseAllTabs(); - - // Tab adding/showing functions ///////////////////////////////////////////// - - // Returns true if the tab strip is editable (for extensions). - bool IsTabStripEditable() const; - - // Returns the index to insert a tab at during session restore and startup. - // |relative_index| gives the index of the url into the number of tabs that - // are going to be opened. For example, if three urls are passed in on the - // command line this is invoked three times with the values 0, 1 and 2. - int GetIndexForInsertionDuringRestore(int relative_index); - - // Adds a selected tab with the specified URL and transition, returns the - // created TabContents. - TabContents* AddSelectedTabWithURL(const GURL& url, - content::PageTransition transition); - - // Add a new tab, given a TabContents. A WebContents appropriate to - // display the last committed entry is created and returned. - content::WebContents* AddTab(TabContents* tab_contents, - content::PageTransition type); - - // Add a tab with its session history restored from the SessionRestore - // system. If select is true, the tab is selected. |tab_index| gives the index - // to insert the tab at. |selected_navigation| is the index of the - // TabNavigation in |navigations| to select. If |extension_app_id| is - // non-empty the tab is an app tab and |extension_app_id| is the id of the - // extension. If |pin| is true and |tab_index|/ is the last pinned tab, then - // the newly created tab is pinned. If |from_last_session| is true, - // |navigations| are from the previous session. - content::WebContents* AddRestoredTab( - const std::vector<TabNavigation>& navigations, - int tab_index, - int selected_navigation, - const std::string& extension_app_id, - bool select, - bool pin, - bool from_last_session, - content::SessionStorageNamespace* storage_namespace); - - // Creates a new tab with the already-created WebContents 'new_contents'. - // The window for the added contents will be reparented correctly when this - // method returns. If |disposition| is NEW_POPUP, |pos| should hold the - // initial position. - void AddWebContents(content::WebContents* new_contents, - WindowOpenDisposition disposition, - const gfx::Rect& initial_pos, - bool user_gesture); - void CloseTabContents(content::WebContents* contents); - - // Replaces the state of the currently selected tab with the session - // history restored from the SessionRestore system. - void ReplaceRestoredTab( - const std::vector<TabNavigation>& navigations, - int selected_navigation, - bool from_last_session, - const std::string& extension_app_id, - content::SessionStorageNamespace* session_storage_namespace); // Invoked when the fullscreen state of the window changes. // BrowserWindow::EnterFullscreen invokes this after the window has become @@ -517,15 +444,6 @@ class Browser : public TabStripModelDelegate, virtual content::WebContents* OpenURL( const content::OpenURLParams& params) OVERRIDE; - // Centralized method for creating a TabContents, configuring and - // installing all its supporting objects and observers. - static TabContents* TabContentsFactory( - Profile* profile, - content::SiteInstance* site_instance, - int routing_id, - const content::WebContents* base_web_contents, - content::SessionStorageNamespace* session_storage_namespace); - // Overridden from TabStripModelDelegate: virtual TabContents* AddBlankTab(bool foreground) OVERRIDE; virtual TabContents* AddBlankTabAt(int index, diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index a6dc0f0..bdabc86 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -33,6 +33,7 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_ui_prefs.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/extensions/application_launch.h" @@ -256,7 +257,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, JavascriptAlertActivatesTab) { AddTabAtIndex(0, url, content::PAGE_TRANSITION_TYPED); EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(0, browser()->active_index()); - WebContents* second_tab = browser()->GetWebContentsAt(1); + WebContents* second_tab = chrome::GetWebContentsAt(browser(), 1); ASSERT_TRUE(second_tab); second_tab->GetRenderViewHost()->ExecuteJavascriptInWebFrame( string16(), @@ -287,8 +288,10 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_ThirtyFourTabs) { // There is one initial tab. const int kTabCount = 34; - for (int ix = 0; ix != (kTabCount - 1); ++ix) - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + for (int ix = 0; ix != (kTabCount - 1); ++ix) { + chrome::AddSelectedTabWithURL(browser(), url, + content::PAGE_TRANSITION_TYPED); + } EXPECT_EQ(kTabCount, browser()->tab_count()); // See GetMaxRendererProcessCount() in @@ -318,10 +321,10 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ReloadThenCancelBeforeUnload) { chrome::Reload(browser(), CURRENT_TAB); AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); alert->CloseModalDialog(); - EXPECT_FALSE(browser()->GetActiveWebContents()->IsLoading()); + EXPECT_FALSE(chrome::GetActiveWebContents(browser())->IsLoading()); // Clear the beforeunload handler so the test can easily exit. - browser()->GetActiveWebContents()->GetRenderViewHost()-> + chrome::GetActiveWebContents(browser())->GetRenderViewHost()-> ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("onbeforeunload=null;")); } @@ -346,7 +349,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CancelBeforeUnloadResetsURL) { // Cancel the dialog. AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); alert->CloseModalDialog(); - EXPECT_FALSE(browser()->GetActiveWebContents()->IsLoading()); + EXPECT_FALSE(chrome::GetActiveWebContents(browser())->IsLoading()); // Wait for the ShouldClose_ACK to arrive. We can detect it by waiting for // the pending RVH to be destroyed. @@ -354,7 +357,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CancelBeforeUnloadResetsURL) { EXPECT_EQ(url.spec(), UTF16ToUTF8(browser()->toolbar_model()->GetText())); // Clear the beforeunload handler so the test can easily exit. - browser()->GetActiveWebContents()->GetRenderViewHost()-> + chrome::GetActiveWebContents(browser())->GetRenderViewHost()-> ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("onbeforeunload=null;")); } @@ -371,14 +374,14 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CancelBeforeUnloadResetsURL) { // Test for crbug.com/11647. A page closed with window.close() should not have // two beforeunload dialogs shown. IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) { - browser()->GetActiveWebContents()->GetRenderViewHost()-> + chrome::GetActiveWebContents(browser())->GetRenderViewHost()-> ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(kOpenNewBeforeUnloadPage)); // Close the new window with JavaScript, which should show a single // beforeunload dialog. Then show another alert, to make it easy to verify // that a second beforeunload dialog isn't shown. - browser()->GetWebContentsAt(0)->GetRenderViewHost()-> + chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost()-> ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("w.close(); alert('bar');")); AppModalDialog* alert = ui_test_utils::WaitForAppModalDialog(); @@ -444,7 +447,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { // Start with an http URL. ui_test_utils::NavigateToURL(browser(), http_url); - WebContents* oldtab = browser()->GetActiveWebContents(); + WebContents* oldtab = chrome::GetActiveWebContents(browser()); content::RenderProcessHost* process = oldtab->GetRenderProcessHost(); // Now open a tab to a blank page, set its opener to null, and redirect it @@ -467,7 +470,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { // Wait for popup window to appear and finish navigating. popup_observer.Wait(); ASSERT_EQ(2, browser()->tab_count()); - WebContents* newtab = browser()->GetActiveWebContents(); + WebContents* newtab = chrome::GetActiveWebContents(browser()); EXPECT_TRUE(newtab); EXPECT_NE(oldtab, newtab); nav_observer.Wait(); @@ -501,7 +504,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, NullOpenerRedirectForksProcess) { // Wait for popup window to appear and finish navigating. popup_observer2.Wait(); ASSERT_EQ(3, browser()->tab_count()); - WebContents* newtab2 = browser()->GetActiveWebContents(); + WebContents* newtab2 = chrome::GetActiveWebContents(browser()); EXPECT_TRUE(newtab2); EXPECT_NE(oldtab, newtab2); nav_observer2.Wait(); @@ -533,7 +536,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) { // Start with an http URL. ui_test_utils::NavigateToURL(browser(), http_url); - WebContents* oldtab = browser()->GetActiveWebContents(); + WebContents* oldtab = chrome::GetActiveWebContents(browser()); content::RenderProcessHost* process = oldtab->GetRenderProcessHost(); // Now open a tab to a blank page, set its opener to null, and redirect it @@ -555,7 +558,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OtherRedirectsDontForkProcess) { // Wait for popup window to appear and finish navigating. popup_observer.Wait(); ASSERT_EQ(2, browser()->tab_count()); - WebContents* newtab = browser()->GetActiveWebContents(); + WebContents* newtab = chrome::GetActiveWebContents(browser()); EXPECT_TRUE(newtab); EXPECT_NE(oldtab, newtab); nav_observer.Wait(); @@ -691,9 +694,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) { ASSERT_TRUE(http_url.SchemeIs(chrome::kHttpScheme)); ASSERT_EQ(1, browser()->tab_count()); - WebContents* initial_tab = browser()->GetWebContentsAt(0); - WebContents* app_tab = browser()->AddSelectedTabWithURL( - http_url, content::PAGE_TRANSITION_TYPED)->web_contents(); + WebContents* initial_tab = chrome::GetWebContentsAt(browser(), 0); + WebContents* app_tab = chrome::AddSelectedTabWithURL( + browser(), http_url, content::PAGE_TRANSITION_TYPED)->web_contents(); ASSERT_EQ(2, browser()->tab_count()); ASSERT_EQ(1u, browser::GetBrowserCount(browser()->profile())); @@ -718,12 +721,12 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) { // Check that the tab contents is in the new browser, and not in the old. ASSERT_EQ(1, browser()->tab_count()); - ASSERT_EQ(initial_tab, browser()->GetWebContentsAt(0)); + ASSERT_EQ(initial_tab, chrome::GetWebContentsAt(browser(), 0)); // Check that the appliaction browser has a single tab, and that tab contains // the content that we app-ified. ASSERT_EQ(1, app_browser->tab_count()); - ASSERT_EQ(app_tab, app_browser->GetWebContentsAt(0)); + ASSERT_EQ(app_tab, chrome::GetWebContentsAt(app_browser, 0)); // Normal tabs should accept load drops. EXPECT_TRUE(initial_tab->GetMutableRendererPrefs()->can_accept_load_drops); @@ -744,7 +747,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ui_test_utils::NavigateToURL(browser(), url); - NavigationEntry* entry = browser()->GetActiveWebContents()-> + NavigationEntry* entry = chrome::GetActiveWebContents(browser())-> GetController().GetActiveEntry(); EXPECT_EQ(expected_favicon_url.spec(), entry->GetFavicon().url.spec()); } @@ -764,7 +767,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_FaviconChange) { ASSERT_TRUE(file_url.SchemeIs(chrome::kFileScheme)); ui_test_utils::NavigateToURL(browser(), file_url); - NavigationEntry* entry = browser()->GetActiveWebContents()-> + NavigationEntry* entry = chrome::GetActiveWebContents(browser())-> GetController().GetActiveEntry(); static const FilePath::CharType* kIcon = FILE_PATH_LITERAL("test1.png"); @@ -788,9 +791,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, TabClosingWhenRemovingExtension) { ui_test_utils::NavigateToURL(browser(), url); - TabContents* app_contents = - Browser::TabContentsFactory(browser()->profile(), NULL, - MSG_ROUTING_NONE, NULL, NULL); + TabContents* app_contents = chrome::TabContentsFactory( + browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL); app_contents->extension_tab_helper()->SetExtensionApp(extension_app); model->AddTabContents(app_contents, 0, content::PageTransitionFromInt(0), @@ -862,8 +864,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { AddTabAtIndex(0, GURL(test_server()->GetURL("files/english_page.html")), content::PAGE_TRANSITION_TYPED); - WebContents* current_web_contents = browser()->GetActiveWebContents(); - TabContents* current_tab_contents = browser()->GetActiveTabContents(); + WebContents* current_web_contents = chrome::GetActiveWebContents(browser()); + TabContents* current_tab_contents = chrome::GetActiveTabContents(browser()); TranslateTabHelper* helper = current_tab_contents->translate_tab_helper(); content::Source<WebContents> source(current_web_contents); @@ -909,9 +911,8 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); const Extension* extension_app = GetExtension(); ui_test_utils::NavigateToURL(browser(), url); - TabContents* app_contents = - Browser::TabContentsFactory(browser()->profile(), NULL, - MSG_ROUTING_NONE, NULL, NULL); + TabContents* app_contents = chrome::TabContentsFactory( + browser()->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL); app_contents->extension_tab_helper()->SetExtensionApp(extension_app); model->AddTabContents(app_contents, 0, content::PageTransitionFromInt(0), TabStripModel::ADD_NONE); @@ -1078,7 +1079,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ForwardDisabledOnForward) { ui_test_utils::WindowedNotificationObserver back_nav_load_observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::GoBack(browser(), CURRENT_TAB); back_nav_load_observer.Wait(); CommandUpdater* command_updater = @@ -1088,7 +1089,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ForwardDisabledOnForward) { ui_test_utils::WindowedNotificationObserver forward_nav_load_observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::GoForward(browser(), CURRENT_TAB); // This check will happen before the navigation completes, since the browser // won't process the renderer's response until the Wait() call below. @@ -1223,7 +1224,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, } IN_PROC_BROWSER_TEST_F(BrowserTest, PageZoom) { - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); bool enable_plus, enable_minus; ui_test_utils::WindowedNotificationObserver zoom_in_observer( @@ -1269,7 +1270,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialCommandDisable) { EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SAVE_PAGE)); EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_ENCODING_MENU)); - WebContents* contents = browser()->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser()); TestInterstitialPage* interstitial = new TestInterstitialPage( contents, false, GURL()); @@ -1327,7 +1328,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, UserGesturesReported) { // Regression test for http://crbug.com/110707. Also tests that a user // gesture is sent when a normal navigation (via e.g. the omnibox) is // performed. - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); MockWebContentsObserver mock_observer(web_contents); ASSERT_TRUE(test_server()->Start()); @@ -1422,9 +1423,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { EXPECT_EQ(4, browser()->tab_count()); // Close the additional browsers. - popup_browser->CloseAllTabs(); - app_browser->CloseAllTabs(); - app_popup_browser->CloseAllTabs(); + chrome::CloseAllTabs(popup_browser); + chrome::CloseAllTabs(app_browser); + chrome::CloseAllTabs(app_popup_browser); } #endif @@ -1434,7 +1435,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, WindowOpenClose) { string16 title = ASCIIToUTF16("Title Of Awesomeness"); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), title); + chrome::GetActiveWebContents(browser()), title); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(browser(), url, 2); EXPECT_EQ(title, title_watcher.WaitAndGetTitle()); } @@ -1456,7 +1457,7 @@ IN_PROC_BROWSER_TEST_F(ShowModalDialogTest, BasicTest) { string16 expected_title(ASCIIToUTF16("SUCCESS")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); ui_test_utils::NavigateToURL(browser(), url); // Verify that we set a mark on successful dialog show. @@ -1469,7 +1470,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, DisallowFileUrlUniversalAccessTest) { string16 expected_title(ASCIIToUTF16("Disallowed")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); title_watcher.AlsoWaitForTitle(ASCIIToUTF16("Allowed")); ui_test_utils::NavigateToURL(browser(), url); ASSERT_EQ(expected_title, title_watcher.WaitAndGetTitle()); diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc index 9a93bcd..8b907b5 100644 --- a/chrome/browser/ui/browser_close_browsertest.cc +++ b/chrome/browser/ui/browser_close_browsertest.cc @@ -15,6 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" @@ -170,10 +171,10 @@ class BrowserCloseTest : public InProcessBrowserTest { // Create a Browser (with associated window) on the specified profile. Browser* CreateBrowserOnProfile(Profile* profile) { Browser* new_browser = Browser::Create(profile); - new_browser->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_START_PAGE); + chrome::AddSelectedTabWithURL(new_browser, GURL(chrome::kAboutBlankURL), + content::PAGE_TRANSITION_START_PAGE); ui_test_utils::WaitForLoadStop( - new_browser->GetActiveWebContents()); + chrome::GetActiveWebContents(new_browser)); new_browser->window()->Show(); return new_browser; } diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 158e74d..bae0fa2 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -20,6 +20,7 @@ #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -228,7 +229,7 @@ void BrowserCommandController::ExecuteCommandWithDisposition( // tab. However, Ben says he tried removing this before and got lots of // crashes, e.g. from Windows sending WM_COMMANDs at random times during // window construction. This probably could use closer examination someday. - if (!browser_->GetActiveTabContents()) + if (!chrome::GetActiveTabContents(browser_)) return; DCHECK(command_updater_.IsCommandEnabled(id)) << "Invalid/disabled command " @@ -856,7 +857,7 @@ void BrowserCommandController::UpdateCommandsForIncognitoAvailability() { } void BrowserCommandController::UpdateCommandsForTabState() { - TabContents* current_tab_contents = browser_->GetActiveTabContents(); + TabContents* current_tab_contents = chrome::GetActiveTabContents(browser_); if (!current_tab_contents) // May be NULL during tab restore. return; WebContents* current_web_contents = current_tab_contents->web_contents(); diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 666e33c..c489064 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -31,6 +31,7 @@ #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_tab_restore_service_delegate.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" @@ -81,7 +82,7 @@ namespace { WebContents* GetOrCloneTabForDisposition(Browser* browser, WindowOpenDisposition disposition) { - TabContents* current_tab = browser->GetActiveTabContents(); + TabContents* current_tab = chrome::GetActiveTabContents(browser); switch (disposition) { case NEW_FOREGROUND_TAB: case NEW_BACKGROUND_TAB: { @@ -111,7 +112,7 @@ void ReloadInternal(Browser* browser, WindowOpenDisposition disposition, bool ignore_cache) { // If we are showing an interstitial, treat this as an OpenURL. - WebContents* current_tab = browser->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser); if (current_tab && current_tab->ShowingInterstitialPage()) { NavigationEntry* entry = current_tab->GetController().GetActiveEntry(); DCHECK(entry); // Should exist if interstitial is showing. @@ -136,13 +137,13 @@ void ReloadInternal(Browser* browser, } bool HasConstrainedWindow(const Browser* browser) { - TabContents* tab_contents = browser->GetActiveTabContents(); + TabContents* tab_contents = GetActiveTabContents(browser); return tab_contents && tab_contents->constrained_window_tab_helper()-> constrained_window_count(); } bool PrintPreviewShowing(const Browser* browser) { - TabContents* contents = browser->GetActiveTabContents(); + TabContents* contents = GetActiveTabContents(browser); printing::PrintPreviewTabController* controller = printing::PrintPreviewTabController::GetInstance(); return controller && (controller->GetPrintPreviewForTab(contents) || @@ -194,7 +195,7 @@ void RemoveCommandObserver(Browser* browser, int GetContentRestrictions(const Browser* browser) { int content_restrictions = 0; - WebContents* current_tab = browser->GetActiveWebContents(); + WebContents* current_tab = GetActiveWebContents(browser); if (current_tab) { content_restrictions = current_tab->GetContentRestrictions(); NavigationEntry* active_entry = @@ -256,18 +257,18 @@ void OpenWindowWithRestoredTabs(Profile* profile) { void OpenURLOffTheRecord(Profile* profile, const GURL& url) { Browser* browser = browser::FindOrCreateTabbedBrowser( profile->GetOffTheRecordProfile()); - browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK); + AddSelectedTabWithURL(browser, url, content::PAGE_TRANSITION_LINK); browser->window()->Show(); } bool CanGoBack(const Browser* browser) { - return browser->GetActiveWebContents()->GetController().CanGoBack(); + return GetActiveWebContents(browser)->GetController().CanGoBack(); } void GoBack(Browser* browser, WindowOpenDisposition disposition) { content::RecordAction(UserMetricsAction("Back")); - TabContents* current_tab = browser->GetActiveTabContents(); + TabContents* current_tab = GetActiveTabContents(browser); if (CanGoBack(browser)) { WebContents* new_tab = GetOrCloneTabForDisposition(browser, disposition); // If we are on an interstitial page and clone the tab, it won't be copied @@ -280,7 +281,7 @@ void GoBack(Browser* browser, WindowOpenDisposition disposition) { } bool CanGoForward(const Browser* browser) { - return browser->GetActiveWebContents()->GetController().CanGoForward(); + return GetActiveWebContents(browser)->GetController().CanGoForward(); } void GoForward(Browser* browser, WindowOpenDisposition disposition) { @@ -361,7 +362,7 @@ void OpenCurrentURL(Browser* browser) { void Stop(Browser* browser) { content::RecordAction(UserMetricsAction("Stop")); - browser->GetActiveWebContents()->Stop(); + GetActiveWebContents(browser)->Stop(); } #if !defined(OS_WIN) @@ -389,7 +390,7 @@ void NewTab(Browser* browser) { if (browser->is_type_tabbed()) { browser->AddBlankTab(true); - browser->GetActiveWebContents()->GetView()->RestoreFocus(); + GetActiveWebContents(browser)->GetView()->RestoreFocus(); } else { Browser* b = browser::FindOrCreateTabbedBrowser(browser->profile()); b->AddBlankTab(true); @@ -397,7 +398,7 @@ void NewTab(Browser* browser) { // The call to AddBlankTab above did not set the focus to the tab as its // window was not active, so we have to do it explicitly. // See http://crbug.com/6380. - b->GetActiveWebContents()->GetView()->RestoreFocus(); + chrome::GetActiveWebContents(b)->GetView()->RestoreFocus(); } } @@ -457,7 +458,7 @@ void MoveTabPrevious(Browser* browser) { void SelectNumberedTab(Browser* browser, int index) { if (index < browser->tab_count()) { content::RecordAction(UserMetricsAction("SelectNumberedTab")); - browser->ActivateTabAt(index, true); + ActivateTabAt(browser, index, true); } } @@ -472,7 +473,7 @@ void DuplicateTab(Browser* browser) { } bool CanDuplicateTab(const Browser* browser) { - WebContents* contents = browser->GetActiveWebContents(); + WebContents* contents = GetActiveWebContents(browser); return contents && contents->GetController().GetLastCommittedEntry(); } @@ -481,7 +482,7 @@ void WriteCurrentURLToClipboard(Browser* browser) { // We don't appear to track the action when it comes from the // RenderContextViewMenu. - WebContents* contents = browser->GetActiveWebContents(); + WebContents* contents = GetActiveWebContents(browser); if (!browser->toolbar_model()->ShouldDisplayURL()) return; @@ -514,7 +515,7 @@ void BookmarkCurrentPage(Browser* browser) { GURL url; string16 title; - TabContents* tab = browser->GetActiveTabContents(); + TabContents* tab = GetActiveTabContents(browser); bookmark_utils::GetURLAndTitleToBookmark(tab->web_contents(), &url, &title); bool was_bookmarked = model->IsBookmarked(url); if (!was_bookmarked && browser->profile()->IsOffTheRecord()) { @@ -555,7 +556,7 @@ void PinCurrentPageToStartScreen(Browser* browser) { void SavePage(Browser* browser) { content::RecordAction(UserMetricsAction("SavePage")); - WebContents* current_tab = browser->GetActiveWebContents(); + WebContents* current_tab = GetActiveWebContents(browser); if (current_tab && current_tab->GetContentsMimeType() == "application/pdf") content::RecordAction(UserMetricsAction("PDF.SavePage")); current_tab->OnSavePage(); @@ -604,9 +605,10 @@ void ShowChromeToMobileBubble(Browser* browser) { void Print(Browser* browser) { if (g_browser_process->local_state()->GetBoolean( prefs::kPrintPreviewDisabled)) { - browser->GetActiveTabContents()->print_view_manager()->PrintNow(); + GetActiveTabContents(browser)->print_view_manager()->PrintNow(); } else { - browser->GetActiveTabContents()->print_view_manager()->PrintPreviewNow(); + GetActiveTabContents(browser)->print_view_manager()-> + PrintPreviewNow(); } } @@ -623,7 +625,8 @@ bool CanPrint(const Browser* browser) { } void AdvancedPrint(Browser* browser) { - browser->GetActiveTabContents()->print_view_manager()->AdvancedPrintNow(); + GetActiveTabContents(browser)->print_view_manager()-> + AdvancedPrintNow(); } bool CanAdvancedPrint(const Browser* browser) { @@ -638,12 +641,12 @@ bool CanAdvancedPrint(const Browser* browser) { } void PrintToDestination(Browser* browser) { - browser->GetActiveTabContents()->print_view_manager()->PrintToDestination(); + GetActiveTabContents(browser)->print_view_manager()->PrintToDestination(); } void EmailPageLocation(Browser* browser) { content::RecordAction(UserMetricsAction("EmailPageLocation")); - WebContents* wc = browser->GetActiveWebContents(); + WebContents* wc = GetActiveWebContents(browser); DCHECK(wc); std::string title = net::EscapeQueryParamValue( @@ -656,7 +659,7 @@ void EmailPageLocation(Browser* browser) { bool CanEmailPageLocation(const Browser* browser) { return browser->toolbar_model()->ShouldDisplayURL() && - browser->GetActiveWebContents()->GetURL().is_valid(); + GetActiveWebContents(browser)->GetURL().is_valid(); } void Cut(Browser* browser) { @@ -697,7 +700,7 @@ void FindInPage(Browser* browser, bool find_next, bool forward_direction) { // We always want to search for the contents of the find pasteboard on OS X. find_text = GetFindPboardText(); #endif - browser->GetActiveTabContents()-> + GetActiveTabContents(browser)-> find_tab_helper()->StartFinding(find_text, forward_direction, false); // Not case sensitive. @@ -709,14 +712,14 @@ void Zoom(Browser* browser, content::PageZoom zoom) { return; content::RenderViewHost* host = - browser->GetActiveWebContents()->GetRenderViewHost(); + GetActiveWebContents(browser)->GetRenderViewHost(); if (zoom == content::PAGE_ZOOM_RESET) { host->SetZoomLevel(0); content::RecordAction(UserMetricsAction("ZoomNormal")); return; } - double current_zoom_level = browser->GetActiveWebContents()->GetZoomLevel(); + double current_zoom_level = GetActiveWebContents(browser)->GetZoomLevel(); double default_zoom_level = browser->profile()->GetPrefs()->GetDouble(prefs::kDefaultZoomLevel); @@ -801,7 +804,7 @@ void ToggleDevToolsWindow(Browser* browser, DevToolsToggleAction action) { content::RecordAction(UserMetricsAction("DevTools_ToggleWindow")); DevToolsWindow::ToggleDevToolsWindow( - browser->GetActiveWebContents()->GetRenderViewHost(), + GetActiveWebContents(browser)->GetRenderViewHost(), action); } @@ -847,7 +850,7 @@ void OpenUpdateChromeDialog(Browser* browser) { } void ToggleSpeechInput(Browser* browser) { - browser->GetActiveWebContents()->GetRenderViewHost()->ToggleSpeechInput(); + GetActiveWebContents(browser)->GetRenderViewHost()->ToggleSpeechInput(); } void ViewSource(Browser* browser, TabContents* contents) { @@ -876,7 +879,7 @@ void ViewSource(Browser* browser, if (!active_entry) return; - GURL view_source_url = GURL(chrome::kViewSourceScheme + std::string(":") + + GURL view_source_url = GURL(kViewSourceScheme + std::string(":") + url.spec()); active_entry->SetVirtualURL(view_source_url); @@ -912,7 +915,7 @@ void ViewSource(Browser* browser, b->window()->Show(); // The page transition below is only for the purpose of inserting the tab. - b->AddTab(view_source_contents, content::PAGE_TRANSITION_LINK); + chrome::AddTab(b, view_source_contents, content::PAGE_TRANSITION_LINK); } SessionService* session_service = @@ -922,15 +925,15 @@ void ViewSource(Browser* browser, } void ViewSelectedSource(Browser* browser) { - ViewSource(browser, browser->GetActiveTabContents()); + ViewSource(browser, chrome::GetActiveTabContents(browser)); } bool CanViewSource(const Browser* browser) { - return browser->GetActiveWebContents()->GetController().CanViewSource(); + return chrome::GetActiveWebContents(browser)->GetController().CanViewSource(); } bool CanCreateApplicationShortcuts(const Browser* browser) { - return web_app::IsValidUrl(browser->GetActiveWebContents()->GetURL()); + return web_app::IsValidUrl(chrome::GetActiveWebContents(browser)->GetURL()); } void ConvertTabToAppWindow(Browser* browser, diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc index c2a7cf7..9cc0fab 100644 --- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc +++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.cc @@ -7,6 +7,7 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" // The URL for when the user clicks "learn more" on the mixed scripting page @@ -34,7 +35,7 @@ void BrowserContentSettingBubbleModelDelegate::ShowContentSettingsPage( // blocking, so bounce to an explanatory page for now. GURL url(google_util::AppendGoogleLocaleParam( GURL(kInsecureScriptHelpUrl))); - browser_->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser_, url, content::PAGE_TRANSITION_LINK); } else { chrome::ShowContentSettings(browser_, type); } diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index acfd111..962cc58 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -23,6 +23,7 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#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/singleton_tabs.h" @@ -104,8 +105,7 @@ Browser* GetBrowserForDisposition(browser::NavigateParams* params) { // GetBrowserForDisposition() has a chance to replace |params->browser| with // another one. if (!params->source_contents && params->browser) - params->source_contents = - params->browser->GetActiveTabContents(); + params->source_contents = chrome::GetActiveTabContents(params->browser); Profile* profile = params->browser ? params->browser->profile() : params->profile; @@ -502,7 +502,7 @@ void Navigate(NavigateParams* params) { WebContents* source_contents = params->source_contents ? params->source_contents->web_contents() : NULL; params->target_contents = - Browser::TabContentsFactory( + chrome::TabContentsFactory( params->browser->profile(), tab_util::GetSiteInstanceForNewTab( params->browser->profile(), url), @@ -586,7 +586,8 @@ void Navigate(NavigateParams* params) { } if (singleton_index >= 0) { - WebContents* target = params->browser->GetWebContentsAt(singleton_index); + WebContents* target = + chrome::GetWebContentsAt(params->browser, singleton_index); if (target->IsCrashed()) { target->GetController().Reload(true); @@ -598,7 +599,7 @@ void Navigate(NavigateParams* params) { // If the singleton tab isn't already selected, select it. if (params->source_contents != params->target_contents) - params->browser->ActivateTabAt(singleton_index, user_initiated); + chrome::ActivateTabAt(params->browser, singleton_index, user_initiated); } if (params->disposition != CURRENT_TAB) { diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index e44ad7b..57521ff 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/omnibox/location_bar.h" @@ -83,16 +84,16 @@ Browser* BrowserNavigatorTest::CreateEmptyBrowserForApp(Browser::Type type, } TabContents* BrowserNavigatorTest::CreateTabContents() { - return Browser::TabContentsFactory( + return chrome::TabContentsFactory( browser()->profile(), NULL, MSG_ROUTING_NONE, - browser()->GetActiveWebContents(), + chrome::GetActiveWebContents(browser()), NULL); } void BrowserNavigatorTest::RunSuppressTest(WindowOpenDisposition disposition) { - GURL old_url = browser()->GetActiveWebContents()->GetURL(); + GURL old_url = chrome::GetActiveWebContents(browser())->GetURL(); browser::NavigateParams p(MakeNavigateParams()); p.disposition = disposition; browser::Navigate(&p); @@ -100,7 +101,7 @@ void BrowserNavigatorTest::RunSuppressTest(WindowOpenDisposition disposition) { // Nothing should have happened as a result of Navigate(); EXPECT_EQ(1, browser()->tab_count()); EXPECT_EQ(1u, BrowserList::size()); - EXPECT_EQ(old_url, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(old_url, chrome::GetActiveWebContents(browser())->GetURL()); } void BrowserNavigatorTest::RunUseNonIncognitoWindowTest(const GURL& url) { @@ -121,7 +122,7 @@ void BrowserNavigatorTest::RunUseNonIncognitoWindowTest(const GURL& url) { EXPECT_NE(incognito_browser, p.browser); EXPECT_EQ(browser(), p.browser); EXPECT_EQ(2, browser()->tab_count()); - EXPECT_EQ(url, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL()); } void BrowserNavigatorTest::RunDoNothingIfIncognitoIsForcedTest( @@ -147,7 +148,7 @@ void BrowserNavigatorTest::RunDoNothingIfIncognitoIsForcedTest( EXPECT_EQ(browser, p.browser); EXPECT_EQ(1, browser->tab_count()); EXPECT_EQ(GURL(chrome::kAboutBlankURL), - browser->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser)->GetURL()); } void BrowserNavigatorTest::Observe( @@ -171,7 +172,7 @@ namespace { // of the Browser remains the same and the current tab bears the loaded URL. IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_CurrentTab) { ui_test_utils::NavigateToURL(browser(), GetGoogleURL()); - EXPECT_EQ(GetGoogleURL(), browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GetGoogleURL(), chrome::GetActiveWebContents(browser())->GetURL()); // We should have one window with one tab. EXPECT_EQ(1u, BrowserList::size()); EXPECT_EQ(1, browser()->tab_count()); @@ -191,10 +192,10 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting) { registrar.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB, content::NotificationService::AllSources()); - browser()->AddSelectedTabWithURL( - singleton_url1, content::PAGE_TRANSITION_LINK); - browser()->AddSelectedTabWithURL( - GetGoogleURL(), content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), singleton_url1, + content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), + content::PAGE_TRANSITION_LINK); // We should have one browser with 3 tabs, the 3rd selected. EXPECT_EQ(1u, BrowserList::size()); @@ -224,8 +225,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, GURL singleton_ref_url2("http://maps.google.com/#b"); GURL singleton_ref_url3("http://maps.google.com/"); - browser()->AddSelectedTabWithURL( - singleton_ref_url1, content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), singleton_ref_url1, + content::PAGE_TRANSITION_LINK); // We should have one browser with 2 tabs, 2nd selected. EXPECT_EQ(1u, BrowserList::size()); @@ -292,23 +293,23 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, // tab count of the Browser increases and the selected tab shifts to the new // foreground tab. IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewForegroundTab) { - WebContents* old_contents = browser()->GetActiveWebContents(); + WebContents* old_contents = chrome::GetActiveWebContents(browser()); browser::NavigateParams p(MakeNavigateParams()); p.disposition = NEW_FOREGROUND_TAB; browser::Navigate(&p); - EXPECT_NE(old_contents, browser()->GetActiveWebContents()); - EXPECT_EQ(browser()->GetActiveTabContents(), p.target_contents); + EXPECT_NE(old_contents, chrome::GetActiveWebContents(browser())); + EXPECT_EQ(chrome::GetActiveTabContents(browser()), p.target_contents); EXPECT_EQ(2, browser()->tab_count()); } // This test verifies that when a navigation results in a background tab, the // tab count of the Browser increases but the selected tab remains the same. IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewBackgroundTab) { - WebContents* old_contents = browser()->GetActiveWebContents(); + WebContents* old_contents = chrome::GetActiveWebContents(browser()); browser::NavigateParams p(MakeNavigateParams()); p.disposition = NEW_BACKGROUND_TAB; browser::Navigate(&p); - WebContents* new_contents = browser()->GetActiveWebContents(); + WebContents* new_contents = chrome::GetActiveWebContents(browser()); // The selected tab should have remained unchanged, since the new tab was // opened in the background. EXPECT_EQ(old_contents, new_contents); @@ -627,7 +628,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, TargetContents_ForegroundTab) { // Navigate() should have opened the contents in a new foreground in the // current Browser. EXPECT_EQ(browser(), p.browser); - EXPECT_EQ(browser()->GetActiveTabContents(), p.target_contents); + EXPECT_EQ(chrome::GetActiveTabContents(browser()), p.target_contents); // We should have one window, with two tabs. EXPECT_EQ(1u, BrowserList::size()); @@ -699,7 +700,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Tabstrip_InsertAtIndex) { // the same result as navigating to a new foreground tab in the (only) // active browser. Tests are the same as for Disposition_NewForegroundTab. IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NullBrowser_NewForegroundTab) { - WebContents* old_contents = browser()->GetActiveWebContents(); + WebContents* old_contents = chrome::GetActiveWebContents(browser()); // Navigate with a NULL browser. browser::NavigateParams p(MakeNavigateParams(NULL)); p.disposition = NEW_FOREGROUND_TAB; @@ -708,8 +709,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NullBrowser_NewForegroundTab) { // Navigate() should have found browser() and create a new tab. EXPECT_EQ(browser(), p.browser); - EXPECT_NE(old_contents, browser()->GetActiveWebContents()); - EXPECT_EQ(browser()->GetActiveTabContents(), p.target_contents); + EXPECT_NE(old_contents, chrome::GetActiveWebContents(browser())); + EXPECT_EQ(chrome::GetActiveTabContents(browser()), p.target_contents); EXPECT_EQ(2, browser()->tab_count()); } @@ -728,7 +729,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NullBrowser_MatchProfile) { // Navigate() should have found incognito, not browser(). EXPECT_EQ(incognito, p.browser); - EXPECT_EQ(incognito->GetActiveTabContents(), p.target_contents); + EXPECT_EQ(chrome::GetActiveTabContents(incognito), p.target_contents); EXPECT_EQ(1, incognito->tab_count()); } @@ -756,8 +757,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NullBrowser_NewWindow) { // no previous tab with that URL (minus the path) exists. IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabNew_IgnorePath) { - browser()->AddSelectedTabWithURL( - GetGoogleURL(), content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), + content::PAGE_TRANSITION_LINK); // We should have one browser with 2 tabs, the 2nd selected. EXPECT_EQ(1u, BrowserList::size()); @@ -778,7 +779,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, EXPECT_EQ(3, browser()->tab_count()); EXPECT_EQ(2, browser()->active_index()); EXPECT_EQ(GetContentSettingsURL(), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // This test verifies that constructing params with disposition = SINGLETON_TAB @@ -787,10 +788,10 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting_IgnorePath) { GURL singleton_url1(GetSettingsURL()); - browser()->AddSelectedTabWithURL( - singleton_url1, content::PAGE_TRANSITION_LINK); - browser()->AddSelectedTabWithURL( - GetGoogleURL(), content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), singleton_url1, + content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), + content::PAGE_TRANSITION_LINK); // We should have one browser with 3 tabs, the 3rd selected. EXPECT_EQ(1u, BrowserList::size()); @@ -811,7 +812,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, EXPECT_EQ(3, browser()->tab_count()); EXPECT_EQ(1, browser()->active_index()); EXPECT_EQ(GetContentSettingsURL(), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // This test verifies that constructing params with disposition = SINGLETON_TAB @@ -820,10 +821,10 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExistingSubPath_IgnorePath) { GURL singleton_url1(GetContentSettingsURL()); - browser()->AddSelectedTabWithURL( - singleton_url1, content::PAGE_TRANSITION_LINK); - browser()->AddSelectedTabWithURL( - GetGoogleURL(), content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), singleton_url1, + content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), + content::PAGE_TRANSITION_LINK); // We should have one browser with 3 tabs, the 3rd selected. EXPECT_EQ(1u, BrowserList::size()); @@ -844,7 +845,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, EXPECT_EQ(3, browser()->tab_count()); EXPECT_EQ(1, browser()->active_index()); EXPECT_EQ(GetClearBrowsingDataURL(), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // This test verifies that constructing params with disposition = SINGLETON_TAB @@ -853,10 +854,10 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExistingSubPath_IgnorePath2) { GURL singleton_url1(GetContentSettingsURL()); - browser()->AddSelectedTabWithURL( - singleton_url1, content::PAGE_TRANSITION_LINK); - browser()->AddSelectedTabWithURL( - GetGoogleURL(), content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), singleton_url1, + content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), + content::PAGE_TRANSITION_LINK); // We should have one browser with 3 tabs, the 3rd selected. EXPECT_EQ(1u, BrowserList::size()); @@ -876,7 +877,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, EXPECT_EQ(3, browser()->tab_count()); EXPECT_EQ(1, browser()->active_index()); EXPECT_EQ(singleton_url1, - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // This test verifies that constructing params with disposition = SINGLETON_TAB @@ -885,8 +886,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabFocused_IgnorePath) { GURL singleton_url_current(GetContentSettingsURL()); - browser()->AddSelectedTabWithURL( - singleton_url_current, content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), singleton_url_current, + content::PAGE_TRANSITION_LINK); // We should have one browser with 2 tabs, the 2nd selected. EXPECT_EQ(1u, BrowserList::size()); @@ -907,7 +908,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->active_index()); EXPECT_EQ(singleton_url_target, - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // This test verifies that constructing params with disposition = SINGLETON_TAB @@ -917,8 +918,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting_IgnoreQuery) { int initial_tab_count = browser()->tab_count(); GURL singleton_url_current("chrome://settings/internet"); - browser()->AddSelectedTabWithURL( - singleton_url_current, content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), singleton_url_current, + content::PAGE_TRANSITION_LINK); EXPECT_EQ(initial_tab_count + 1, browser()->tab_count()); EXPECT_EQ(initial_tab_count, browser()->active_index()); @@ -965,7 +966,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, } EXPECT_EQ(1u, BrowserList::size()); - EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GetSettingsURL(), + chrome::GetActiveWebContents(browser())->GetURL()); } // Settings page is expected to always open in normal mode regardless @@ -1014,8 +1016,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateToCrashedSingletonTab) { GURL singleton_url(GetContentSettingsURL()); - TabContents* tab_contents = browser()->AddSelectedTabWithURL( - singleton_url, content::PAGE_TRANSITION_LINK); + TabContents* tab_contents = chrome::AddSelectedTabWithURL( + browser(), singleton_url, content::PAGE_TRANSITION_LINK); WebContents* web_contents = tab_contents->web_contents(); // We should have one browser with 2 tabs, the 2nd selected. @@ -1048,7 +1050,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, observer.Wait(); } EXPECT_EQ(1, browser()->tab_count()); - EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GetSettingsURL(), + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, @@ -1065,7 +1068,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, observer.Wait(); } EXPECT_EQ(1, browser()->tab_count()); - EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GetSettingsURL(), + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, @@ -1075,7 +1079,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ui_test_utils::NavigateToURL(&p); EXPECT_EQ(1, browser()->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); { ui_test_utils::WindowedNotificationObserver observer( @@ -1085,14 +1089,15 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, observer.Wait(); } EXPECT_EQ(1, browser()->tab_count()); - EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GetSettingsURL(), + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NavigateFromPageToOptionsInNewTab) { browser::NavigateParams p(MakeNavigateParams()); ui_test_utils::NavigateToURL(&p); - EXPECT_EQ(GetGoogleURL(), browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GetGoogleURL(), chrome::GetActiveWebContents(browser())->GetURL()); EXPECT_EQ(1u, BrowserList::size()); EXPECT_EQ(1, browser()->tab_count()); @@ -1104,7 +1109,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, observer.Wait(); } EXPECT_EQ(2, browser()->tab_count()); - EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GetSettingsURL(), + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, @@ -1129,7 +1135,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, observer.Wait(); } EXPECT_EQ(2, browser()->tab_count()); - EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(GetSettingsURL(), + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, @@ -1143,7 +1150,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, } EXPECT_EQ(1, browser()->tab_count()); EXPECT_EQ(GetClearBrowsingDataURL(), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); chrome::NewTab(browser()); EXPECT_EQ(2, browser()->tab_count()); @@ -1157,7 +1164,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, } EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(GetClearBrowsingDataURL(), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // Times out on mac, fails on linux. @@ -1180,8 +1187,8 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - browser()->AddSelectedTabWithURL( - GetGoogleURL(), content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(), + content::PAGE_TRANSITION_LINK); observer.Wait(); } @@ -1194,7 +1201,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, } EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(GetSettingsURL(), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // Tests that when a new tab is opened from the omnibox, the focus is moved from @@ -1246,7 +1253,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, } EXPECT_EQ(1, browser()->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUIHistoryFrameURL), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, @@ -1260,7 +1267,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, } EXPECT_EQ(1, browser()->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUIBookmarksURL), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, @@ -1274,7 +1281,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, } EXPECT_EQ(1, browser()->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUIDownloadsURL), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); } // This test makes sure any link in a crashed panel page navigates to a tabbed @@ -1312,13 +1319,13 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserNavigatorTest, NavigateFromCrashedPanel) { EXPECT_EQ(1, panel_browser->tab_count()); // Kill the panel page. - WebContents* web_contents = panel_browser->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(panel_browser); web_contents->SetIsCrashed(base::TERMINATION_STATUS_PROCESS_CRASHED, -1); EXPECT_TRUE(web_contents->IsCrashed()); // Navigate to the page. browser::NavigateParams p2(MakeNavigateParams(panel_browser)); - p2.source_contents = panel_browser->GetActiveTabContents(); + p2.source_contents = chrome::GetActiveTabContents(panel_browser); p2.url = url2; p2.disposition = CURRENT_TAB; browser::Navigate(&p2); diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc index 37c2b77..6b7daa7 100644 --- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc +++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc @@ -10,6 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -54,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(BrowserGuestSessionNavigatorTest, EXPECT_EQ(incognito_browser, p.browser); EXPECT_EQ(2, incognito_browser->tab_count()); EXPECT_EQ(GURL("chrome://chrome/settings"), - incognito_browser->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(incognito_browser)->GetURL()); } } // namespace diff --git a/chrome/browser/ui/browser_tab_restore_service_delegate.cc b/chrome/browser/ui/browser_tab_restore_service_delegate.cc index 3c985f2..c4b0234 100644 --- a/chrome/browser/ui/browser_tab_restore_service_delegate.cc +++ b/chrome/browser/ui/browser_tab_restore_service_delegate.cc @@ -7,7 +7,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabrestore.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "content/public/browser/navigation_controller.h" using content::NavigationController; @@ -36,15 +39,15 @@ std::string BrowserTabRestoreServiceDelegate::GetAppName() const { WebContents* BrowserTabRestoreServiceDelegate::GetWebContentsAt( int index) const { - return browser_->GetWebContentsAt(index); + return chrome::GetWebContentsAt(browser_, index); } WebContents* BrowserTabRestoreServiceDelegate::GetActiveWebContents() const { - return browser_->GetActiveWebContents(); + return chrome::GetActiveWebContents(browser_); } bool BrowserTabRestoreServiceDelegate::IsTabPinned(int index) const { - return browser_->IsTabPinned(index); + return browser_->tab_strip_model()->IsTabPinned(index); } WebContents* BrowserTabRestoreServiceDelegate::AddRestoredTab( @@ -56,9 +59,9 @@ WebContents* BrowserTabRestoreServiceDelegate::AddRestoredTab( bool pin, bool from_last_session, SessionStorageNamespace* storage_namespace) { - return browser_->AddRestoredTab(navigations, tab_index, selected_navigation, - extension_app_id, select, pin, - from_last_session, storage_namespace); + return chrome::AddRestoredTab(browser_, navigations, tab_index, + selected_navigation, extension_app_id, select, + pin, from_last_session, storage_namespace); } void BrowserTabRestoreServiceDelegate::ReplaceRestoredTab( @@ -67,9 +70,9 @@ void BrowserTabRestoreServiceDelegate::ReplaceRestoredTab( bool from_last_session, const std::string& extension_app_id, SessionStorageNamespace* session_storage_namespace) { - browser_->ReplaceRestoredTab(navigations, selected_navigation, - from_last_session, extension_app_id, - session_storage_namespace); + chrome::ReplaceRestoredTab(browser_, navigations, selected_navigation, + from_last_session, extension_app_id, + session_storage_namespace); } void BrowserTabRestoreServiceDelegate::CloseTab() { diff --git a/chrome/browser/ui/browser_tabrestore.cc b/chrome/browser/ui/browser_tabrestore.cc new file mode 100644 index 0000000..74aca77 --- /dev/null +++ b/chrome/browser/ui/browser_tabrestore.cc @@ -0,0 +1,117 @@ +// 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. + +#include "chrome/browser/ui/browser_tabrestore.h" + +#include "chrome/browser/extensions/extension_tab_helper.h" +#include "chrome/browser/sessions/session_service.h" +#include "chrome/browser/sessions/session_service_factory.h" +#include "chrome/browser/tab_contents/tab_util.h" +#include "chrome/browser/ui/browser.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/tabs/tab_strip_model.h" +#include "content/public/browser/navigation_controller.h" +#include "content/public/browser/navigation_entry.h" +#include "content/public/browser/web_contents.h" +#include "content/public/browser/web_contents_view.h" +#include "ipc/ipc_message.h" + +using content::WebContents; +using content::NavigationController; +using content::NavigationEntry; + +namespace chrome { + +int GetIndexForInsertionDuringRestore(Browser* browser, int relative_index) { + return (browser->tab_strip_model()->insertion_policy() == + TabStripModel::INSERT_AFTER) ? browser->tab_count() : relative_index; +} + +content::WebContents* AddRestoredTab( + Browser* browser, + const std::vector<TabNavigation>& navigations, + int tab_index, + int selected_navigation, + const std::string& extension_app_id, + bool select, + bool pin, + bool from_last_session, + content::SessionStorageNamespace* storage_namespace) { + GURL restore_url = navigations.at(selected_navigation).virtual_url(); + TabContents* tab_contents = chrome::TabContentsFactory( + browser->profile(), + tab_util::GetSiteInstanceForNewTab(browser->profile(), restore_url), + MSG_ROUTING_NONE, + chrome::GetActiveWebContents(browser), + storage_namespace); + WebContents* new_tab = tab_contents->web_contents(); + tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id); + std::vector<NavigationEntry*> entries; + TabNavigation::CreateNavigationEntriesFromTabNavigations( + browser->profile(), navigations, &entries); + new_tab->GetController().Restore( + selected_navigation, from_last_session, &entries); + DCHECK_EQ(0u, entries.size()); + + int add_types = select ? TabStripModel::ADD_ACTIVE : + TabStripModel::ADD_NONE; + if (pin) { + int first_mini_tab_idx = + browser->tab_strip_model()->IndexOfFirstNonMiniTab(); + tab_index = std::min(tab_index, first_mini_tab_idx); + add_types |= TabStripModel::ADD_PINNED; + } + browser->tab_strip_model()->InsertTabContentsAt(tab_index, tab_contents, + add_types); + if (select) { + browser->window()->Activate(); + } else { + // We set the size of the view here, before WebKit does its initial + // layout. If we don't, the initial layout of background tabs will be + // performed with a view width of 0, which may cause script outputs and + // anchor link location calculations to be incorrect even after a new + // layout with proper view dimensions. TabStripModel::AddTabContents() + // contains similar logic. + new_tab->GetView()->SizeContents( + browser->window()->GetRestoredBounds().size()); + new_tab->WasHidden(); + } + SessionService* session_service = + SessionServiceFactory::GetForProfileIfExisting(browser->profile()); + if (session_service) + session_service->TabRestored(tab_contents, pin); + return new_tab; +} + +void ReplaceRestoredTab( + Browser* browser, + const std::vector<TabNavigation>& navigations, + int selected_navigation, + bool from_last_session, + const std::string& extension_app_id, + content::SessionStorageNamespace* session_storage_namespace) { + GURL restore_url = navigations.at(selected_navigation).virtual_url(); + TabContents* tab_contents = chrome::TabContentsFactory( + browser->profile(), + tab_util::GetSiteInstanceForNewTab(browser->profile(), restore_url), + MSG_ROUTING_NONE, + GetActiveWebContents(browser), + session_storage_namespace); + tab_contents->extension_tab_helper()->SetExtensionAppById(extension_app_id); + WebContents* replacement = tab_contents->web_contents(); + std::vector<NavigationEntry*> entries; + TabNavigation::CreateNavigationEntriesFromTabNavigations( + browser->profile(), navigations, &entries); + replacement->GetController().Restore( + selected_navigation, from_last_session, &entries); + DCHECK_EQ(0u, entries.size()); + + browser->tab_strip_model()->ReplaceNavigationControllerAt( + browser->active_index(), + tab_contents); +} + +} // namespace chrome diff --git a/chrome/browser/ui/browser_tabrestore.h b/chrome/browser/ui/browser_tabrestore.h new file mode 100644 index 0000000..df738e7 --- /dev/null +++ b/chrome/browser/ui/browser_tabrestore.h @@ -0,0 +1,60 @@ +// 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_UI_BROWSER_TABRESTORE_H_ +#define CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_ +#pragma once + +#include <vector> + +#include "chrome/browser/sessions/session_types.h" + +class Browser; + +namespace content { +class SessionStorageNamespace; +class WebContents; +} + +namespace chrome { + +// Returns the index to insert a tab at during session restore and startup. +// |relative_index| gives the index of the url into the number of tabs that +// are going to be opened. For example, if three urls are passed in on the +// command line this is invoked three times with the values 0, 1 and 2. +int GetIndexForInsertionDuringRestore(Browser* browser, int relative_index); + +// Add a tab with its session history restored from the SessionRestore +// system. If select is true, the tab is selected. |tab_index| gives the index +// to insert the tab at. |selected_navigation| is the index of the +// TabNavigation in |navigations| to select. If |extension_app_id| is +// non-empty the tab is an app tab and |extension_app_id| is the id of the +// extension. If |pin| is true and |tab_index|/ is the last pinned tab, then +// the newly created tab is pinned. If |from_last_session| is true, +// |navigations| are from the previous session. +content::WebContents* AddRestoredTab( + Browser* browser, + const std::vector<TabNavigation>& navigations, + int tab_index, + int selected_navigation, + const std::string& extension_app_id, + bool select, + bool pin, + bool from_last_session, + content::SessionStorageNamespace* storage_namespace); + +// Replaces the state of the currently selected tab with the session +// history restored from the SessionRestore system. +void ReplaceRestoredTab( + Browser* browser, + const std::vector<TabNavigation>& navigations, + int selected_navigation, + bool from_last_session, + const std::string& extension_app_id, + content::SessionStorageNamespace* session_storage_namespace); + + +} // namespace chrome + +#endif // CHROME_BROWSER_UI_BROWSER_TABRESTORE_H_ diff --git a/chrome/browser/ui/browser_tabstrip.cc b/chrome/browser/ui/browser_tabstrip.cc new file mode 100644 index 0000000..6b17776 --- /dev/null +++ b/chrome/browser/ui/browser_tabstrip.cc @@ -0,0 +1,153 @@ +// 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. + +#include "chrome/browser/ui/browser_tabstrip.h" + +#include "base/command_line.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_window.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 "content/public/browser/navigation_entry.h" +#include "content/public/browser/render_view_host.h" +#include "content/public/browser/web_contents.h" + +namespace chrome { + +int GetIndexOfTab(const Browser* browser, + const content::WebContents* contents) { + return browser->tab_strip_model()->GetIndexOfWebContents(contents); +} + +TabContents* GetActiveTabContents(const Browser* browser) { + return browser->tab_strip_model()->GetActiveTabContents(); +} + +content::WebContents* GetActiveWebContents(const Browser* browser) { + TabContents* active_tab = GetActiveTabContents(browser); + return active_tab ? active_tab->web_contents() : NULL; +} + +TabContents* GetTabContentsAt(const Browser* browser, int index) { + return browser->tab_strip_model()->GetTabContentsAt(index); +} + +content::WebContents* GetWebContentsAt(const Browser* browser, int index) { + TabContents* tab = GetTabContentsAt(browser, index); + return tab ? tab->web_contents() : NULL; +} + +void ActivateTabAt(Browser* browser, int index, bool user_gesture) { + browser->tab_strip_model()->ActivateTabAt(index, user_gesture); +} + +bool IsTabStripEditable(Browser* browser) { + return browser->window()->IsTabStripEditable(); +} + +TabContents* AddSelectedTabWithURL(Browser* browser, + const GURL& url, + content::PageTransition transition) { + browser::NavigateParams params(browser, url, transition); + params.disposition = NEW_FOREGROUND_TAB; + browser::Navigate(¶ms); + return params.target_contents; +} + +void AddTab(Browser* browser, + TabContents* tab_contents, + content::PageTransition type) { + browser->tab_strip_model()->AddTabContents(tab_contents, -1, type, + TabStripModel::ADD_ACTIVE); +} + +void AddWebContents(Browser* browser, + content::WebContents* source_contents, + content::WebContents* new_contents, + WindowOpenDisposition disposition, + const gfx::Rect& initial_pos, + bool user_gesture) { + // No code for this yet. + DCHECK(disposition != SAVE_TO_DISK); + // Can't create a new contents for the current tab - invalid case. + DCHECK(disposition != CURRENT_TAB); + + TabContents* source_tab_contents = NULL; + BlockedContentTabHelper* source_blocked_content = NULL; + TabContents* new_tab_contents = TabContents::FromWebContents(new_contents); + if (!new_tab_contents) + new_tab_contents = new TabContents(new_contents); + if (source_contents) { + source_tab_contents = TabContents::FromWebContents(source_contents); + source_blocked_content = source_tab_contents->blocked_content_tab_helper(); + } + + if (source_tab_contents) { + // Handle blocking of all contents. + if (source_blocked_content->all_contents_blocked()) { + source_blocked_content->AddTabContents(new_tab_contents, + disposition, + initial_pos, + user_gesture); + return; + } + + // Handle blocking of popups. + if ((disposition == NEW_POPUP) && !user_gesture && + !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisablePopupBlocking)) { + // Unrequested popups from normal pages are constrained unless they're in + // the white list. The popup owner will handle checking this. + source_tab_contents->blocked_content_tab_helper()-> + AddPopup(new_tab_contents, initial_pos, user_gesture); + return; + } + + new_contents->GetRenderViewHost()->DisassociateFromPopupCount(); + } + + browser::NavigateParams params(browser, new_tab_contents); + params.source_contents = source_contents ? + GetTabContentsAt(browser, GetIndexOfTab(browser, source_contents)) : NULL; + params.disposition = disposition; + params.window_bounds = initial_pos; + params.window_action = browser::NavigateParams::SHOW_WINDOW; + params.user_gesture = user_gesture; + browser::Navigate(¶ms); +} + +void CloseWebContents(Browser* browser, content::WebContents* contents) { + int index = browser->tab_strip_model()->GetIndexOfWebContents(contents); + if (index == TabStripModel::kNoTab) { + NOTREACHED() << "CloseWebContents called for tab not in our strip"; + return; + } + browser->tab_strip_model()->CloseTabContentsAt( + index, + TabStripModel::CLOSE_CREATE_HISTORICAL_TAB); +} + +void CloseAllTabs(Browser* browser) { + browser->tab_strip_model()->CloseAllTabs(); +} + +TabContents* TabContentsFactory( + Profile* profile, + content::SiteInstance* site_instance, + int routing_id, + const content::WebContents* base_web_contents, + content::SessionStorageNamespace* session_storage_namespace) { + return new TabContents(content::WebContents::Create( + profile, + site_instance, + routing_id, + base_web_contents, + session_storage_namespace)); +} + +} // namespace chrome diff --git a/chrome/browser/ui/browser_tabstrip.h b/chrome/browser/ui/browser_tabstrip.h new file mode 100644 index 0000000..5c1f8e4 --- /dev/null +++ b/chrome/browser/ui/browser_tabstrip.h @@ -0,0 +1,78 @@ +// 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_UI_BROWSER_TABSTRIP_H_ +#define CHROME_BROWSER_UI_BROWSER_TABSTRIP_H_ +#pragma once + +#include "content/public/common/page_transition_types.h" +#include "webkit/glue/window_open_disposition.h" + +class Browser; +class GURL; +class Profile; +class TabContents; + +namespace content { +class SessionStorageNamespace; +class SiteInstance; +class WebContents; +} + +namespace gfx { +class Rect; +} + +namespace chrome { + +int GetIndexOfTab(const Browser* browser, const content::WebContents* contents); + +TabContents* GetActiveTabContents(const Browser* browser); +content::WebContents* GetActiveWebContents(const Browser* browser); + +TabContents* GetTabContentsAt(const Browser* browser, int index); +content::WebContents* GetWebContentsAt(const Browser* browser, int index); + +void ActivateTabAt(Browser* browser, int index, bool user_gesture); + +// Used by extensions. +bool IsTabStripEditable(Browser* browser); + +// Adds a selected tab with the specified URL and transition, returns the +// created TabContents. +TabContents* AddSelectedTabWithURL(Browser* browser, + const GURL& url, + content::PageTransition transition); + +// Adds |tab_contents| to |browser|'s tabstrip. +void AddTab(Browser* browser, + TabContents* tab_contents, + content::PageTransition type); + +// Creates a new tab with the already-created WebContents 'new_contents'. +// The window for the added contents will be reparented correctly when this +// method returns. If |disposition| is NEW_POPUP, |pos| should hold the +// initial position. +void AddWebContents(Browser* browser, + content::WebContents* source_contents, + content::WebContents* new_contents, + WindowOpenDisposition disposition, + const gfx::Rect& initial_pos, + bool user_gesture); +void CloseWebContents(Browser* browser, content::WebContents* contents); + +void CloseAllTabs(Browser* browser); + +// Centralized method for creating a TabContents, configuring and +// installing all its supporting objects and observers. +TabContents* TabContentsFactory( + Profile* profile, + content::SiteInstance* site_instance, + int routing_id, + const content::WebContents* base_web_contents, + content::SessionStorageNamespace* session_storage_namespace); + +} // namespace chrome + +#endif // CHROME_BROWSER_UI_BROWSER_TABSTRIP_H_ diff --git a/chrome/browser/ui/browser_toolbar_model_delegate.cc b/chrome/browser/ui/browser_toolbar_model_delegate.cc index 3c410f0..067f2ca 100644 --- a/chrome/browser/ui/browser_toolbar_model_delegate.cc +++ b/chrome/browser/ui/browser_toolbar_model_delegate.cc @@ -5,6 +5,7 @@ #include "chrome/browser/ui/browser_toolbar_model_delegate.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" BrowserToolbarModelDelegate::BrowserToolbarModelDelegate(Browser* browser) : browser_(browser) { @@ -15,5 +16,5 @@ BrowserToolbarModelDelegate::~BrowserToolbarModelDelegate() { content::WebContents* BrowserToolbarModelDelegate::GetActiveWebContents() const { - return browser_->GetActiveWebContents(); + return chrome::GetActiveWebContents(browser_); } diff --git a/chrome/browser/ui/browser_win.cc b/chrome/browser/ui/browser_win.cc index 641b38c..04e203f 100644 --- a/chrome/browser/ui/browser_win.cc +++ b/chrome/browser/ui/browser_win.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #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/fullscreen/fullscreen_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -62,7 +63,7 @@ void PinCurrentPageToStartScreen(Browser* browser) { if (metro_module) { GURL url; string16 title; - TabContents* tab = browser->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser); bookmark_utils::GetURLAndTitleToBookmark(tab->web_contents(), &url, &title); typedef BOOL (*MetroPinUrlToStartScreen)(const string16&, const string16&); diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm index 8ca34dc..fbeffb2 100644 --- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm +++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm @@ -6,6 +6,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h" #import "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #import "chrome/browser/ui/cocoa/applescript/window_applescript.h" @@ -34,8 +35,8 @@ IN_PROC_BROWSER_TEST_F(BrowserCrApplicationAppleScriptTest, Creation) { } // Close the additional browsers. - b1->CloseAllTabs(); - b2->CloseAllTabs(); + chrome::CloseAllTabs(b1); + chrome::CloseAllTabs(b2); } // Insert a new window. diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm index 619c80d..f48a9842 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm @@ -15,6 +15,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #include "chrome/browser/ui/cocoa/applescript/error_applescript.h" @@ -117,7 +118,7 @@ // Note: applescript is 1-based, that is lists begin with index 1. int atIndex = [anActiveTabIndex intValue] - 1; if (atIndex >= 0 && atIndex < browser_->tab_count()) - browser_->ActivateTabAt(atIndex, true); + chrome::ActivateTabAt(browser_, atIndex, true); else AppleScript::SetError(AppleScript::errInvalidTabIndex); } @@ -139,7 +140,7 @@ - (TabAppleScript*)activeTab { TabAppleScript* currentTab = [[[TabAppleScript alloc] - initWithTabContent:browser_->GetActiveTabContents()] + initWithTabContent:chrome::GetActiveTabContents(browser_)] autorelease]; [currentTab setContainer:self property:AppleScript::kTabsProperty]; @@ -152,7 +153,7 @@ for (int i = 0; i < browser_->tab_count(); ++i) { // Check to see if tab is closing. - TabContents* tab_contents = browser_->GetTabContentsAt(i); + TabContents* tab_contents = chrome::GetTabContentsAt(browser_, i); if (tab_contents->in_destructor()) { continue; } @@ -174,9 +175,10 @@ // Set how long it takes a tab to be created. base::TimeTicks newTabStartTime = base::TimeTicks::Now(); - TabContents* contents = - browser_->AddSelectedTabWithURL(GURL(chrome::kChromeUINewTabURL), - content::PAGE_TRANSITION_TYPED); + TabContents* contents = chrome::AddSelectedTabWithURL( + browser_, + GURL(chrome::kChromeUINewTabURL), + content::PAGE_TRANSITION_TYPED); contents->web_contents()->SetNewTabStartTime(newTabStartTime); [aTab setTabContent:contents]; } @@ -202,7 +204,7 @@ } - (void)removeFromTabsAtIndex:(int)index { - browser_->CloseTabContents(browser_->GetWebContentsAt(index)); + chrome::CloseWebContents(browser_, chrome::GetWebContentsAt(browser_, index)); } - (NSNumber*)orderedIndex { diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm index 1bd5635..a9f49e9 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -8,6 +8,7 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -50,7 +51,7 @@ using content::WebContents; Browser* browser = browser::GetLastActiveBrowser(); const int tabCount = browser->tab_count(); for (int i = 0; i < tabCount; ++i) { - WebContents* contents = browser->GetWebContentsAt(i); + WebContents* contents = chrome::GetWebContentsAt(browser, i); ActiveTabNameURLPair tabPair(contents->GetTitle(), contents->GetURL()); activeTabPairsVector_.push_back(tabPair); } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 878fa2a..37a2f89 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -19,6 +19,7 @@ #import "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" #import "chrome/browser/ui/cocoa/background_gradient_view.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h" @@ -789,7 +790,7 @@ void RecordAppLaunch(Profile* profile, GURL url) { GURL url; string16 title; bookmark_utils::GetURLAndTitleToBookmark( - browser_->GetActiveWebContents(), &url, &title); + chrome::GetActiveWebContents(browser_), &url, &title); BookmarkEditor::Show([[self view] window], browser_->profile(), BookmarkEditor::EditDetails::AddNodeInFolder( @@ -2293,7 +2294,7 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { #pragma mark BookmarkBarToolbarViewController Protocol - (int)currentTabContentsHeight { - WebContents* wc = browser_->GetActiveWebContents(); + WebContents* wc = chrome::GetActiveWebContents(browser_); return wc ? wc->GetView()->GetContainerSize().height() : 0; } diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index de4141e..4f3472f 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -18,6 +18,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window_state.h" #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h" @@ -231,7 +232,7 @@ void BrowserWindowCocoa::BookmarkBarStateChanged( void BrowserWindowCocoa::UpdateDevTools() { [controller_ updateDevToolsForContents: - browser_->GetActiveWebContents()]; + chrome::GetActiveWebContents(browser_)]; } void BrowserWindowCocoa::SetDevToolsDockSide(DevToolsDockSide side) { diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index bad8520..a643322 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -29,6 +29,7 @@ #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window_state.h" #import "chrome/browser/ui/cocoa/background_gradient_view.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" @@ -420,7 +421,7 @@ enum { } - (void)dealloc { - browser_->CloseAllTabs(); + chrome::CloseAllTabs(browser_.get()); [downloadShelfController_ exiting]; // Explicitly release |presentationModeController_| here, as it may call back @@ -598,7 +599,7 @@ enum { - (void)windowDidBecomeKey:(NSNotification*)notification { // We need to activate the controls (in the "WebView"). To do this, get the // selected WebContents's RenderWidgetHostView and tell it to activate. - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->SetActive(true); } @@ -615,7 +616,7 @@ enum { // We need to deactivate the controls (in the "WebView"). To do this, get the // selected WebContents's RenderWidgetHostView and tell it to deactivate. - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->SetActive(false); } @@ -626,7 +627,7 @@ enum { [self saveWindowPositionIfNeeded]; // Let the selected RenderWidgetHostView know, so that it can tell plugins. - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->SetWindowVisibility(false); } @@ -635,7 +636,7 @@ enum { // Called when we have been unminimized. - (void)windowDidDeminiaturize:(NSNotification *)notification { // Let the selected RenderWidgetHostView know, so that it can tell plugins. - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->SetWindowVisibility(true); } @@ -646,7 +647,7 @@ enum { // Let the selected RenderWidgetHostView know, so that it can tell plugins // (unless we are minimized, in which case nothing has really changed). if (![[self window] isMiniaturized]) { - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->SetWindowVisibility(false); } @@ -658,7 +659,7 @@ enum { // Let the selected RenderWidgetHostView know, so that it can tell plugins // (unless we are minimized, in which case nothing has really changed). if (![[self window] isMiniaturized]) { - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->SetWindowVisibility(true); } @@ -703,7 +704,7 @@ enum { std::max(kProportion * NSWidth(frame), std::min(kProportion * NSHeight(frame), NSWidth(frame))); - WebContents* contents = browser_->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser_.get()); if (contents) { // If the intrinsic width is bigger, then make it the zoomed width. const int kScrollbarWidth = 16; // TODO(viettrungluu): ugh. @@ -940,7 +941,8 @@ enum { if (resizeRectDirty) { // Send new resize rect to foreground tab. - if (content::WebContents* contents = browser_->GetActiveWebContents()) { + if (content::WebContents* contents = + chrome::GetActiveWebContents(browser_.get())) { if (content::RenderViewHost* rvh = contents->GetRenderViewHost()) { rvh->ResizeRectChanged(windowShim_->GetRootWindowResizerRect()); } @@ -980,7 +982,7 @@ enum { DCHECK(browser_.get()); Profile* profile = browser_->profile(); DCHECK(profile); - WebContents* current_tab = browser_->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser_.get()); if (!current_tab) { return; } @@ -1233,7 +1235,8 @@ enum { if (!isBrowser) return; BrowserWindowController* dragBWC = (BrowserWindowController*)dragController; int index = [dragBWC->tabStripController_ modelIndexForTabView:view]; - TabContents* contents = dragBWC->browser_->GetTabContentsAt(index); + TabContents* contents = + chrome::GetTabContentsAt(dragBWC->browser_.get(), index); // The tab contents may have gone away if given a window.close() while it // is being dragged. If so, bail, we've got nothing to drop. if (!contents) @@ -1254,7 +1257,7 @@ enum { // Before the tab is detached from its originating tab strip, store the // pinned state so that it can be maintained between the windows. - bool isPinned = dragBWC->browser_->IsTabPinned(index); + bool isPinned = dragBWC->browser_->tab_strip_model()->IsTabPinned(index); // Now that we have enough information about the tab, we can remove it from // the dragging window. We need to do this *before* we add it to the new @@ -1311,7 +1314,7 @@ enum { // Fetch the tab contents for the tab being dragged. int index = [tabStripController_ modelIndexForTabView:tabView]; - TabContents* contents = browser_->GetTabContentsAt(index); + TabContents* contents = chrome::GetTabContentsAt(browser_.get(), index); // Set the window size. Need to do this before we detach the tab so it's // still in the window. We have to flip the coordinates as that's what @@ -1334,7 +1337,7 @@ enum { -tabOverflow.width, -tabOverflow.height); // Before detaching the tab, store the pinned state. - bool isPinned = browser_->IsTabPinned(index); + bool isPinned = browser_->tab_strip_model()->IsTabPinned(index); // Detach it from the source window, which just updates the model without // deleting the tab contents. This needs to come before creating the new @@ -1494,7 +1497,7 @@ enum { } - (NSString*)activeTabTitle { - WebContents* contents = browser_->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser_.get()); return base::SysUTF16ToNSString(contents->GetTitle()); } @@ -1767,7 +1770,7 @@ enum { } // Let the selected RenderWidgetHostView know, so that it can tell plugins. - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->WindowFrameChanged(); } @@ -1821,7 +1824,7 @@ enum { [self resetWindowGrowthState]; // Let the selected RenderWidgetHostView know, so that it can tell plugins. - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->WindowFrameChanged(); } diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index ef632cf..744ed3b 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -14,6 +14,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_util.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window_state.h" #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" #import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h" @@ -482,7 +483,7 @@ willPositionSheet:(NSWindow*)sheet // If the relayout shifts the content area up or down, let the renderer know. if (contentShifted) { - if (WebContents* contents = browser_->GetActiveWebContents()) { + if (WebContents* contents = chrome::GetActiveWebContents(browser_.get())) { if (RenderWidgetHostView* rwhv = contents->GetRenderWidgetHostView()) rwhv->WindowFrameChanged(); } @@ -497,7 +498,7 @@ willPositionSheet:(NSWindow*)sheet - (BOOL)shouldShowDetachedBookmarkBar { DCHECK(browser_.get()); - TabContents* tab = browser_->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser_.get()); return (tab && tab->bookmark_tab_helper()->ShouldShowBookmarkBar() && ![previewableContentsController_ isShowingPreview]); } diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.mm b/chrome/browser/ui/cocoa/cocoa_profile_test.mm index b33e967..fdec1b0 100644 --- a/chrome/browser/ui/cocoa/cocoa_profile_test.mm +++ b/chrome/browser/ui/cocoa/cocoa_profile_test.mm @@ -8,6 +8,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/testing_browser_process.h" #include "content/public/test/test_browser_thread.h" @@ -89,7 +90,7 @@ BrowserWindow* CocoaProfileTest::CreateBrowserWindow() { void CocoaProfileTest::CloseBrowserWindow() { // Check to make sure a window was actually created. DCHECK(browser_->window()); - browser_->CloseAllTabs(); + chrome::CloseAllTabs(browser_.get()); chrome::CloseWindow(browser_.get()); // |browser_| will be deleted by its BrowserWindowController. ignore_result(browser_.release()); diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index 1f76a47..9df2898 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -15,6 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/restore_tab_helper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" #import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h" #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" @@ -837,7 +838,7 @@ class ExtensionServiceObserverBridge : public content::NotificationObserver, } - (int)currentTabId { - TabContents* selected_tab = browser_->GetActiveTabContents(); + TabContents* selected_tab = chrome::GetActiveTabContents(browser_); if (!selected_tab) return -1; diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index beae5f3..78cae6c 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -13,6 +13,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" @@ -99,7 +100,7 @@ int CurrentTabId() { Browser* browser = browser::GetLastActiveBrowser(); if(!browser) return -1; - WebContents* contents = browser->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser); if (!contents) return -1; return ExtensionTabUtil::GetTabId(contents); diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm index 295ab24..4fd9504 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_bridge.mm @@ -12,6 +12,7 @@ #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_dialogs.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -30,7 +31,7 @@ static void ShowGenericExtensionInstalledInfoBar( const extensions::Extension* new_extension, Browser* browser, const SkBitmap& icon) { - TabContents* tab_contents = browser->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser); if (!tab_contents) return; diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm index 2bace10..2f4ba5f 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller_unittest.mm @@ -6,6 +6,7 @@ #include "base/mac/mac_util.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" @@ -65,9 +66,8 @@ class FullscreenExitBubbleControllerTest : public CocoaProfileTest { } void AppendTabToStrip() { - TabContents* tab_contents = Browser::TabContentsFactory( - profile(), site_instance_, MSG_ROUTING_NONE, - NULL, NULL); + TabContents* tab_contents = chrome::TabContentsFactory( + profile(), site_instance_, MSG_ROUTING_NONE, NULL, NULL); browser()->tab_strip_model()->AppendTabContents( tab_contents, /*foreground=*/true); } @@ -85,7 +85,7 @@ TEST_F(FullscreenExitBubbleControllerTest, DenyExitsFullscreen) { [bwc showWindow:nil]; AppendTabToStrip(); - WebContents* fullscreen_tab = browser()->GetActiveWebContents(); + WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser()); { base::mac::ScopedNSAutoreleasePool pool; ui_test_utils::WindowedNotificationObserver fullscreen_observer( diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm index a496a5f..7e6f1dc 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm @@ -19,6 +19,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" @@ -191,7 +192,7 @@ bool KeystonePromotionInfoBarDelegate::ShouldExpireInternal( [[KeystoneGlue defaultKeystoneGlue] needsPromotion]) { Browser* browser = browser::GetLastActiveBrowser(); if (browser) { - TabContents* tabContents = browser->GetActiveTabContents(); + TabContents* tabContents = chrome::GetActiveTabContents(browser); // Only show if no other info bars are showing, because that's how the // default browser info bar works. diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index 688b2a3..5d70e2e 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm @@ -13,6 +13,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h" #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" @@ -262,7 +263,7 @@ bool ContentSettingDecoration::AcceptsMousePress() { bool ContentSettingDecoration::OnMousePressed(NSRect frame) { // Get host. This should be shared on linux/win/osx medium-term. Browser* browser = browser::GetLastActiveBrowser(); - TabContents* tabContents = browser->GetActiveTabContents(); + TabContents* tabContents = chrome::GetActiveTabContents(browser); if (!tabContents) return true; diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index ccef5ad..d634b9e 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -28,6 +28,7 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h" #include "chrome/browser/ui/cocoa/event_utils.h" #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" @@ -322,7 +323,7 @@ InstantController* LocationBarViewMac::GetInstant() { } TabContents* LocationBarViewMac::GetTabContents() const { - return browser_->GetActiveTabContents(); + return chrome::GetActiveTabContents(browser_); } void LocationBarViewMac::Revert() { @@ -356,7 +357,7 @@ int LocationBarViewMac::PageActionVisibleCount() { } WebContents* LocationBarViewMac::GetWebContents() const { - return browser_->GetActiveWebContents(); + return chrome::GetActiveWebContents(browser_); } PageActionDecoration* LocationBarViewMac::GetPageActionDecoration( @@ -574,7 +575,7 @@ void LocationBarViewMac::PostNotification(NSString* notification) { bool LocationBarViewMac::RefreshContentSettingsDecorations() { const bool input_in_progress = toolbar_model_->input_in_progress(); WebContents* web_contents = - input_in_progress ? NULL : browser_->GetActiveWebContents(); + input_in_progress ? NULL : chrome::GetActiveWebContents(browser_); bool icons_updated = false; for (size_t i = 0; i < content_setting_decorations_.size(); ++i) { icons_updated |= diff --git a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm index 4b7cae6..2b8a856 100644 --- a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm +++ b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm @@ -4,7 +4,8 @@ #import "chrome/browser/ui/cocoa/tabpose_window.h" -#import "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/browser_tabstrip.h" +#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -24,9 +25,8 @@ class TabposeWindowTest : public CocoaProfileTest { } void AppendTabToStrip() { - TabContents* tab_contents = Browser::TabContentsFactory( - profile(), site_instance_, MSG_ROUTING_NONE, - NULL, NULL); + TabContents* tab_contents = chrome::TabContentsFactory( + profile(), site_instance_, MSG_ROUTING_NONE, NULL, NULL); browser()->tab_strip_model()->AppendTabContents( tab_contents, /*foreground=*/true); } diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 4551d10..0615da0 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -29,6 +29,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "chrome/browser/ui/cocoa/drag_util.h" @@ -1220,8 +1221,8 @@ private: NSInteger activeIndex = [self indexFromModelIndex:modelIndex]; if (oldContents) { - int oldModelIndex = browser_->GetIndexOfController( - &(oldContents->web_contents()->GetController())); + int oldModelIndex = + chrome::GetIndexOfTab(browser_, oldContents->web_contents()); if (oldModelIndex != -1) { // When closing a tab, the old tab may be gone. NSInteger oldIndex = [self indexFromModelIndex:oldModelIndex]; TabContentsController* oldController = diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm index 950afe0..f4eb124 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm @@ -6,7 +6,8 @@ #include <vector> -#import "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/browser_tabstrip.h" +#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #import "chrome/browser/ui/cocoa/new_tab_button.h" #import "chrome/browser/ui/cocoa/tabs/tab_controller.h" @@ -118,9 +119,8 @@ class TabStripControllerTest : public CocoaProfileTest { TEST_F(TabStripControllerTest, AddRemoveTabs) { EXPECT_TRUE(model_->empty()); SiteInstance* instance = SiteInstance::Create(profile()); - TabContents* tab_contents = - Browser::TabContentsFactory(profile(), instance, - MSG_ROUTING_NONE, NULL, NULL); + TabContents* tab_contents = chrome::TabContentsFactory( + profile(), instance, MSG_ROUTING_NONE, NULL, NULL); model_->AppendTabContents(tab_contents, true); EXPECT_EQ(model_->count(), 1); } @@ -136,16 +136,14 @@ TEST_F(TabStripControllerTest, RearrangeTabs) { TEST_F(TabStripControllerTest, CorrectToolTipText) { // Create tab 1. SiteInstance* instance = SiteInstance::Create(profile()); - TabContents* tab_contents = - Browser::TabContentsFactory(profile(), instance, - MSG_ROUTING_NONE, NULL, NULL); + TabContents* tab_contents = chrome::TabContentsFactory( + profile(), instance, MSG_ROUTING_NONE, NULL, NULL); model_->AppendTabContents(tab_contents, true); // Create tab 2. SiteInstance* instance2 = SiteInstance::Create(profile()); - TabContents* tab_contents2 = - Browser::TabContentsFactory(profile(), instance2, - MSG_ROUTING_NONE, NULL, NULL); + TabContents* tab_contents2 = chrome::TabContentsFactory( + profile(), instance2, MSG_ROUTING_NONE, NULL, NULL); model_->AppendTabContents(tab_contents2, true); // Set tab 1 tooltip. diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 289c306..7b5195c 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -24,6 +24,7 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/background_gradient_view.h" #include "chrome/browser/ui/cocoa/drag_util.h" @@ -768,7 +769,7 @@ class NotificationBridge : public content::NotificationObserver { } OpenURLParams params( url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false); - browser_->GetActiveWebContents()->OpenURL(params); + chrome::GetActiveWebContents(browser_)->OpenURL(params); } // (URLDropTargetController protocol) @@ -785,7 +786,7 @@ class NotificationBridge : public content::NotificationObserver { OpenURLParams params( url, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false); - browser_->GetActiveWebContents()->OpenURL(params); + chrome::GetActiveWebContents(browser_)->OpenURL(params); } // (URLDropTargetController protocol) diff --git a/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm b/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm index 50a1d58..2e17db5 100644 --- a/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm +++ b/chrome/browser/ui/cocoa/web_intent_sheet_controller_browsertest.mm @@ -5,6 +5,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/cocoa/web_intent_picker_cocoa.h" #import "chrome/browser/ui/cocoa/web_intent_sheet_controller.h" #include "chrome/browser/ui/intents/web_intent_picker_delegate.h" @@ -58,7 +59,7 @@ void WebIntentSheetControllerBrowserTest::CreatePicker() { } IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest, CloseWillClose) { - CreateBubble(browser()->GetActiveTabContents()); + CreateBubble(chrome::GetActiveTabContents(browser())); EXPECT_CALL(delegate_, OnPickerClosed()).Times(0); EXPECT_CALL(delegate_, OnClosing()); @@ -69,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest, CloseWillClose) { IN_PROC_BROWSER_TEST_F(WebIntentSheetControllerBrowserTest, DontCancelAfterServiceInvokation) { - CreateBubble(browser()->GetActiveTabContents()); + CreateBubble(chrome::GetActiveTabContents(browser())); GURL url; model_.AddInstalledService(string16(), url, diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index 267a421..85252c4 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc @@ -16,6 +16,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/panels/panel_manager.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -209,8 +210,8 @@ WebContents* OpenApplicationWindow( if (app_browser) *app_browser = browser; - TabContents* tab_contents = - browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_START_PAGE); + TabContents* tab_contents = chrome::AddSelectedTabWithURL( + browser, url, content::PAGE_TRANSITION_START_PAGE); WebContents* contents = tab_contents->web_contents(); contents->GetMutableRendererPrefs()->can_accept_load_drops = false; contents->GetRenderViewHost()->SyncRendererPrefs(); @@ -303,7 +304,7 @@ WebContents* OpenApplicationTab(Profile* profile, params.disposition = disposition; if (disposition == CURRENT_TAB) { - WebContents* existing_tab = browser->GetActiveWebContents(); + WebContents* existing_tab = chrome::GetActiveWebContents(browser); TabStripModel* model = browser->tab_strip_model(); int tab_index = model->GetIndexOfWebContents(existing_tab); @@ -313,7 +314,7 @@ WebContents* OpenApplicationTab(Profile* profile, WebKit::WebReferrerPolicyDefault), disposition, content::PAGE_TRANSITION_LINK, false)); // Reset existing_tab as OpenURL() may have clobbered it. - existing_tab = browser->GetActiveWebContents(); + existing_tab = chrome::GetActiveWebContents(browser); if (params.tabstrip_add_types & TabStripModel::ADD_PINNED) { model->SetTabPinned(tab_index, true); // Pinning may have moved the tab. diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc index 36a3e02..f6650cf 100644 --- a/chrome/browser/ui/extensions/shell_window.cc +++ b/chrome/browser/ui/extensions/shell_window.cc @@ -15,6 +15,7 @@ #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/intents/web_intent_picker_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -229,8 +230,8 @@ void ShellWindow::AddNewContents(WebContents* source, // new window. disposition = disposition == NEW_BACKGROUND_TAB ? disposition : NEW_FOREGROUND_TAB; - browser->AddWebContents( - new_contents, disposition, initial_pos, user_gesture); + chrome::AddWebContents(browser, NULL, new_contents, disposition, initial_pos, + user_gesture); } void ShellWindow::OnNativeClose() { diff --git a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index 8eb6e67..ff12699 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/find_bar/find_bar.h" @@ -184,7 +185,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageFrames) { // Try incremental search (mimicking user typing in). int ordinal = 0; - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); EXPECT_EQ(18, FindInPageWchar(tab, L"g", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); @@ -274,7 +275,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageEndState) { GURL url = GetURL(kEndState); ui_test_utils::NavigateToURL(browser(), url); - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(NULL != tab_contents); // Verify that nothing has focus. @@ -326,7 +327,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageOrdinal) { // Search for 'o', which should make the first item active and return // '1 in 3' (1st ordinal of a total of 3 matches). - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); int ordinal = 0; EXPECT_EQ(3, FindInPageWchar(tab, L"o", kFwd, kIgnoreCase, &ordinal)); @@ -362,7 +363,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, ui_test_utils::NavigateToURL(browser(), url); // Search for a text that exists within a link on the page. - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(NULL != tab); int ordinal = 0; EXPECT_EQ(4, FindInPageWchar(tab, @@ -398,7 +399,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPageMultiFramesOrdinal) { // Search for 'a', which should make the first item active and return // '1 in 7' (1st ordinal of a total of 7 matches). - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); int ordinal = 0; EXPECT_EQ(7, FindInPageWchar(tab, L"a", kFwd, kIgnoreCase, &ordinal)); @@ -447,7 +448,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindInPage_Issue5132) { // Search for 'goa' three times (6 matches on page). int ordinal = 0; - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); EXPECT_EQ(6, FindInPageWchar(tab, L"goa", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); @@ -489,7 +490,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NavigateClearsOrdinal) { EnsureFindBoxOpen(); // Search for a text that exists within a link on the page. - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(NULL != tab); int ordinal = 0; EXPECT_EQ(8, FindInPageWchar(tab, @@ -515,7 +516,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindUnselectableText) { ui_test_utils::NavigateToURL(browser(), url); int ordinal = 0; - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); EXPECT_EQ(1, FindInPageWchar(tab, L"text", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); } @@ -536,7 +537,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue1341577) { // TODO(jungshik): According to a native Malayalam speaker, it's ok not // to find U+0D4C. Still need to investigate further this issue. int ordinal = 0; - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); FindInPageWchar(tab, L"\u0D4C", kFwd, kIgnoreCase, &ordinal); FindInPageWchar(tab, L"\u0D4C", kFwd, kIgnoreCase, &ordinal); @@ -558,7 +559,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindCrash_Issue14491) { // This used to crash the tab. int ordinal = 0; - EXPECT_EQ(0, FindInPageWchar(browser()->GetActiveTabContents(), + EXPECT_EQ(0, FindInPageWchar(chrome::GetActiveTabContents(browser()), L"s", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(0, ordinal); } @@ -579,7 +580,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindRestarts_Issue1155639) { // This string appears 5 times at the bottom of a long page. If Find restarts // properly after a timeout, it will find 5 matches, not just 1. int ordinal = 0; - EXPECT_EQ(5, FindInPageWchar(browser()->GetActiveTabContents(), + EXPECT_EQ(5, FindInPageWchar(chrome::GetActiveTabContents(browser()), L"008.xml", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); @@ -595,7 +596,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindRestarts_Issue70505) { // If this test hangs on the FindInPage call, then it might be a regression // such as the one found in issue http://crbug.com/70505. int ordinal = 0; - FindInPageWchar(browser()->GetActiveTabContents(), + FindInPageWchar(chrome::GetActiveTabContents(browser()), L"a", kFwd, kIgnoreCase, &ordinal); EXPECT_EQ(1, ordinal); // TODO(finnur): We cannot reliably get the matchcount for this Find call @@ -610,7 +611,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, GURL url = GetURL(kPrematureEnd); ui_test_utils::NavigateToURL(browser(), url); - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(NULL != tab_contents); // Search for a text that exists within a link on the page. @@ -639,7 +640,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindDisappearOnNavigate) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveTabContents()->web_contents()-> + &chrome::GetActiveTabContents(browser())->web_contents()-> GetController())); chrome::Reload(browser(), CURRENT_TAB); observer.Wait(); @@ -742,7 +743,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FindMovesWhenObscuring) { EXPECT_TRUE(GetFindBarWindowInfo(&start_position, &fully_visible)); EXPECT_TRUE(fully_visible); - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); int moved_x_coord = FindInPageTillBoxMoves(tab, start_position.x(), L"Chromium", kMoveIterations); @@ -799,7 +800,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, // Search for 'no_match'. No matches should be found. int ordinal = 0; - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); EXPECT_EQ(0, FindInPageWchar(tab, L"no_match", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(0, ordinal); @@ -883,7 +884,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, StayActive) { // backspace, but that's been proven flaky in the past, so we go straight to // tab_contents. FindTabHelper* find_tab_helper = - browser()->GetActiveTabContents()->find_tab_helper(); + chrome::GetActiveTabContents(browser())->find_tab_helper(); // Stop the (non-existing) find operation, and clear the selection (which // signals the UI is still active). find_tab_helper->StopFinding(FindBarController::kClearSelectionOnPage); @@ -901,7 +902,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, RestartSearchFromF3) { // Search for 'page'. Should have 1 match. int ordinal = 0; - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); EXPECT_EQ(1, FindInPageWchar(tab, L"page", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(1, ordinal); @@ -931,7 +932,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) { // Find "Default". int ordinal = 0; - TabContents* tab1 = browser()->GetActiveTabContents(); + TabContents* tab1 = chrome::GetActiveTabContents(browser()); EXPECT_EQ(1, FindInPageWchar(tab1, L"text", kFwd, kIgnoreCase, &ordinal)); // Create a second tab. @@ -940,14 +941,14 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) { // something relating to user gesture. browser()->AddBlankTab(true); ui_test_utils::NavigateToURL(browser(), url); - TabContents* tab2 = browser()->GetActiveTabContents(); + TabContents* tab2 = chrome::GetActiveTabContents(browser()); EXPECT_NE(tab1, tab2); // Find "given". FindInPageWchar(tab2, L"given", kFwd, kIgnoreCase, &ordinal); // Switch back to first tab. - browser()->ActivateTabAt(0, false); + chrome::ActivateTabAt(browser(), 0, false); browser()->GetFindBarController()->EndFindSession( FindBarController::kKeepSelectionOnPage, FindBarController::kKeepResultsInFindBox); @@ -970,7 +971,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateSameTab) { // Search for the word "page". int ordinal = 0; - TabContents* tab1 = browser()->GetActiveTabContents(); + TabContents* tab1 = chrome::GetActiveTabContents(browser()); EXPECT_EQ(1, FindInPageWchar(tab1, L"page", kFwd, kIgnoreCase, &ordinal)); // Open the Find box. @@ -1008,13 +1009,13 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulateInNewTab) { // Search for the word "page". int ordinal = 0; - TabContents* tab1 = browser()->GetActiveTabContents(); + TabContents* tab1 = chrome::GetActiveTabContents(browser()); EXPECT_EQ(1, FindInPageWchar(tab1, L"page", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(ASCIIToUTF16("1 of 1"), GetMatchCountText()); // Now create a second tab and load the same page. - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); - TabContents* tab2 = browser()->GetActiveTabContents(); + chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + TabContents* tab2 = chrome::GetActiveTabContents(browser()); EXPECT_NE(tab1, tab2); // Open the Find box. @@ -1042,7 +1043,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) { // Search for the word "page". int ordinal = 0; - TabContents* tab1 = browser()->GetActiveTabContents(); + TabContents* tab1 = chrome::GetActiveTabContents(browser()); EXPECT_EQ(1, FindInPageWchar(tab1, L"page", kFwd, kIgnoreCase, &ordinal)); // Open the Find box. @@ -1058,7 +1059,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) { // Now create a second tab and load the same page. browser()->AddBlankTab(true); ui_test_utils::NavigateToURL(browser(), url); - TabContents* tab2 = browser()->GetActiveTabContents(); + TabContents* tab2 = chrome::GetActiveTabContents(browser()); EXPECT_NE(tab1, tab2); // Search for the word "text". @@ -1066,7 +1067,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) { // Go back to the first tab and make sure we have NOT switched the prepopulate // text to "text". - browser()->ActivateTabAt(0, false); + chrome::ActivateTabAt(browser(), 0, false); // Open the Find box. EnsureFindBoxOpen(); @@ -1113,7 +1114,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) { // Search for the word "page" in the normal browser tab. int ordinal = 0; - TabContents* tab1 = browser()->GetActiveTabContents(); + TabContents* tab1 = chrome::GetActiveTabContents(browser()); EXPECT_EQ(1, FindInPageWchar(tab1, L"page", kFwd, kIgnoreCase, &ordinal)); // Open the Find box. @@ -1131,8 +1132,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - incognito_browser->AddSelectedTabWithURL( - url, content::PAGE_TRANSITION_START_PAGE); + chrome::AddSelectedTabWithURL(incognito_browser, url, + content::PAGE_TRANSITION_START_PAGE); observer.Wait(); incognito_browser->window()->Show(); @@ -1141,8 +1142,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) { EXPECT_EQ(ASCIIToUTF16("page"), GetFindBarTextForBrowser(incognito_browser)); // Search for the word "text" in the incognito tab. - TabContents* incognito_tab = - incognito_browser->GetActiveTabContents(); + TabContents* incognito_tab = chrome::GetActiveTabContents(incognito_browser); EXPECT_EQ(1, FindInPageWchar(incognito_tab, L"text", kFwd, kIgnoreCase, &ordinal)); EXPECT_EQ(ASCIIToUTF16("text"), GetFindBarTextForBrowser(incognito_browser)); @@ -1153,8 +1153,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, MAYBE_NoIncognitoPrepopulate) { FindBarController::kKeepResultsInFindBox); // Now open a new tab in the original (non-incognito) browser. - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); - TabContents* tab2 = browser()->GetActiveTabContents(); + chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); + TabContents* tab2 = chrome::GetActiveTabContents(browser()); EXPECT_NE(tab1, tab2); // Open the Find box and make sure it is prepopulated with the search term @@ -1169,7 +1169,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, ActivateLinkNavigatesPage) { GURL url = GetURL(kLinkPage); ui_test_utils::NavigateToURL(browser(), url); - TabContents* tab = browser()->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser()); int ordinal = 0; FindInPageWchar(tab, L"link", kFwd, kIgnoreCase, &ordinal); EXPECT_EQ(ordinal, 1); @@ -1192,8 +1192,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, FitWindow) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - popup->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL), - content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(popup, GURL(chrome::kAboutBlankURL), + content::PAGE_TRANSITION_LINK); // Wait for the page to finish loading. observer.Wait(); popup->window()->Show(); diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.cc b/chrome/browser/ui/fullscreen/fullscreen_controller.cc index 67e3992..0464b8b 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller.cc @@ -11,6 +11,7 @@ #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.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" @@ -72,7 +73,7 @@ bool FullscreenController::IsFullscreenForTabOrPending( TabContents::FromWebContents(web_contents); if (!tab_contents || (tab_contents != fullscreened_tab_)) return false; - DCHECK(web_contents == browser_->GetActiveWebContents()); + DCHECK(web_contents == chrome::GetActiveWebContents(browser_)); return true; } @@ -153,7 +154,7 @@ void FullscreenController::RequestToLockMouse(WebContents* web_contents, void FullscreenController::ToggleFullscreenModeForTab(WebContents* web_contents, bool enter_fullscreen) { - if (web_contents != browser_->GetActiveWebContents()) + if (web_contents != chrome::GetActiveWebContents(browser_)) return; #if defined(OS_WIN) @@ -562,7 +563,7 @@ void FullscreenController::ToggleFullscreenModeInternal(bool for_tab) { GURL url; if (for_tab) { - url = browser_->GetActiveWebContents()->GetURL(); + url = chrome::GetActiveWebContents(browser_)->GetURL(); tab_fullscreen_accepted_ = toggled_into_fullscreen_ && GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW; } else { diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc index 3aeb2cd..48c02ce 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_browsertest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -301,7 +302,7 @@ IN_PROC_BROWSER_TEST_F( AddTabAtIndexAndWait( 0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); { FullscreenNotificationObserver fullscreen_observer; @@ -339,20 +340,20 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, content::PAGE_TRANSITION_TYPED); AddTabAtIndexAndWait(0, GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_TYPED); - WebContents* tab1 = browser()->GetActiveWebContents(); + WebContents* tab1 = chrome::GetActiveWebContents(browser()); // Request mouse lock. Bubble is displayed. RequestToLockMouse(true, false); ASSERT_TRUE(IsFullscreenBubbleDisplayed()); // Activate current tab. Mouse lock bubble remains. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ASSERT_TRUE(IsFullscreenBubbleDisplayed()); // Activate second tab. Mouse lock bubble clears. { MouseLockNotificationObserver mouse_lock_observer; - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); mouse_lock_observer.Wait(); } ASSERT_FALSE(IsFullscreenBubbleDisplayed()); @@ -364,7 +365,7 @@ IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, ASSERT_TRUE(IsFullscreenBubbleDisplayed()); // Close first tab while second active. Mouse lock bubble remains. - browser()->CloseTabContents(tab1); + chrome::CloseWebContents(browser(), tab1); ASSERT_TRUE(IsFullscreenBubbleDisplayed()); } diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc index 0ba098e..311a87f 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_interactive_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h" #include "content/public/browser/render_view_host.h" @@ -23,7 +24,7 @@ class FullscreenControllerInteractiveTest // Verify that IsMouseLocked is consistent between the // Fullscreen Controller and the Render View Host View. EXPECT_TRUE(browser()->IsMouseLocked() == - browser()->GetActiveWebContents()-> + chrome::GetActiveWebContents(browser())-> GetRenderViewHost()->GetView()->IsMouseLocked()); return browser()->IsMouseLocked(); } diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc index 6ce2abe..630082d 100644 --- a/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc +++ b/chrome/browser/ui/fullscreen/fullscreen_controller_test.cc @@ -7,6 +7,7 @@ #include "base/command_line.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" #include "chrome/common/chrome_switches.h" @@ -54,7 +55,7 @@ void FullscreenControllerTest::ToggleBrowserFullscreen(bool enter_fullscreen) { void FullscreenControllerTest::RequestToLockMouse( bool user_gesture, bool last_unlocked_by_target) { - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); browser()->RequestToLockMouse(tab, user_gesture, last_unlocked_by_target); } @@ -109,7 +110,7 @@ bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() { } void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() { - WebContents* fullscreen_tab = browser()->GetActiveWebContents(); + WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser()); FullscreenExitBubbleType type = browser()->fullscreen_controller_->GetFullscreenExitBubbleType(); browser()->OnAcceptFullscreenPermission(fullscreen_tab->GetURL(), type); @@ -151,7 +152,7 @@ void FullscreenControllerTest::Reload() { void FullscreenControllerTest::ToggleTabFullscreen_Internal( bool enter_fullscreen, bool retry_until_success) { - WebContents* tab = browser()->GetActiveWebContents(); + WebContents* tab = chrome::GetActiveWebContents(browser()); if (IsFullscreenForBrowser()) { // Changing tab fullscreen state will not actually change the window // when browser fullscreen is in effect. diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc index a669327..5edb212 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc @@ -20,6 +20,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_menu_controller_gtk.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h" @@ -692,7 +693,7 @@ bool BookmarkBarGtk::GetTabContentsSize(gfx::Size* size) { NOTREACHED(); return false; } - WebContents* web_contents = browser->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser); if (!web_contents) { // It is possible to have a browser but no WebContents while under testing, // so don't NOTREACHED() and error the program. diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc index 09d046ad..45ac0ff3 100644 --- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc +++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc @@ -6,6 +6,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/gtk/view_id_util.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -37,10 +38,10 @@ IN_PROC_BROWSER_TEST_F(BookmarkBarGtkInteractiveUITest, FindBarTest) { // Create new tab with an arbitrary URL. GURL url = test_server()->GetURL(kSimplePage); - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); // Switch back to the NTP with the active findbar. - browser()->ActivateTabAt(1, false); + chrome::ActivateTabAt(browser(), 1, false); // Wait for the findbar to show. MessageLoop::current()->RunAllPending(); diff --git a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc index 332395c..e2cd0d6 100644 --- a/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_actions_toolbar_gtk.cc @@ -22,6 +22,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/restore_tab_helper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/extensions/extension_popup_gtk.h" #include "chrome/browser/ui/gtk/gtk_chrome_button.h" @@ -582,7 +583,7 @@ BrowserActionsToolbarGtk::~BrowserActionsToolbarGtk() { } int BrowserActionsToolbarGtk::GetCurrentTabId() { - TabContents* active_tab = browser_->GetActiveTabContents(); + TabContents* active_tab = chrome::GetActiveTabContents(browser_); if (!active_tab) return -1; diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index b04eb04..bfb42b2 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -26,6 +26,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/gtk/accelerators_gtk.h" #include "chrome/browser/ui/gtk/avatar_menu_button_gtk.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" @@ -950,7 +951,7 @@ bool BrowserTitlebar::IsCommandIdChecked(int command_id) const { EncodingMenuController controller; if (controller.DoesCommandBelongToEncodingMenu(command_id)) { WebContents* web_contents = - browser_window_->browser()->GetActiveWebContents(); + chrome::GetActiveWebContents(browser_window_->browser()); if (web_contents) { return controller.IsItemChecked(browser_window_->browser()->profile(), web_contents->GetEncoding(), diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 0c54248..10bcb3a 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -41,6 +41,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window_state.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h" @@ -829,8 +830,7 @@ void BrowserWindowGtk::BookmarkBarStateChanged( } void BrowserWindowGtk::UpdateDevTools() { - UpdateDevToolsForContents( - browser_->GetActiveWebContents()); + UpdateDevToolsForContents(chrome::GetActiveWebContents(browser_.get())); } void BrowserWindowGtk::SetDevToolsDockSide(DevToolsDockSide side) { @@ -873,7 +873,7 @@ void BrowserWindowGtk::LoadingAnimationCallback() { tabstrip_->UpdateLoadingAnimations(); } else if (ShouldShowWindowIcon()) { // ... or in the window icon area for popups and app windows. - WebContents* web_contents = browser_->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser_.get()); // GetSelectedTabContents can return NULL for example under Purify when // the animations are running slowly and this function is called on // a timer through LoadingAnimationCallback. @@ -1286,7 +1286,7 @@ void BrowserWindowGtk::ShowPasswordGenerationBubble( const gfx::Rect& rect, autofill::PasswordGenerator* password_generator, const webkit::forms::PasswordForm& form) { - WebContents* web_contents = browser_->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser_.get()); if (!web_contents || !web_contents->GetContentNativeView()) { return; } @@ -1327,7 +1327,8 @@ void BrowserWindowGtk::Observe(int type, void BrowserWindowGtk::TabDetachedAt(TabContents* contents, int index) { // We use index here rather than comparing |contents| because by this time // the model has already removed |contents| from its list, so - // browser_->GetActiveWebContents() will return NULL or something else. + // chrome::GetActiveWebContents(browser_.get()) will return NULL or something + // else. if (index == browser_->active_index()) { infobar_container_->ChangeTabContents(NULL); UpdateDevToolsForContents(NULL); @@ -2220,8 +2221,7 @@ gboolean BrowserWindowGtk::OnKeyPress(GtkWidget* widget, GdkEventKey* event) { // If a widget besides the native view is focused, we have to try to handle // the custom accelerators before letting it handle them. - WebContents* current_web_contents = - browser()->GetActiveWebContents(); + WebContents* current_web_contents = chrome::GetActiveWebContents(browser()); // The current tab might not have a render view if it crashed. if (!current_web_contents || !current_web_contents->GetContentNativeView() || !gtk_widget_is_focus(current_web_contents->GetContentNativeView())) { diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index 4140b515..0778063 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -26,6 +26,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #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/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" @@ -282,7 +283,7 @@ gboolean PaintNoBackground(GtkWidget* widget, WebContents* GetBrowserWindowSelectedWebContents(BrowserWindow* window) { BrowserWindowGtk* browser_window = static_cast<BrowserWindowGtk*>( window); - return browser_window->browser()->GetActiveWebContents(); + return chrome::GetActiveWebContents(browser_window->browser()); } GtkWidget* GetBrowserWindowFocusedWidget(BrowserWindow* window) { diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index a5ea7e8..94a4bbf 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -42,6 +42,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" #include "chrome/browser/ui/content_settings/content_setting_image_model.h" #include "chrome/browser/ui/gtk/bookmarks/bookmark_bubble_gtk.h" @@ -461,7 +462,7 @@ void LocationBarViewGtk::SetSiteTypeDragSource() { } WebContents* LocationBarViewGtk::GetWebContents() const { - return browser_->GetActiveWebContents(); + return chrome::GetActiveWebContents(browser_); } void LocationBarViewGtk::SetPreviewEnabledPageAction( @@ -667,7 +668,7 @@ InstantController* LocationBarViewGtk::GetInstant() { } TabContents* LocationBarViewGtk::GetTabContents() const { - return browser_->GetActiveTabContents(); + return chrome::GetActiveTabContents(browser_); } void LocationBarViewGtk::ShowFirstRunBubble() { @@ -757,7 +758,7 @@ void LocationBarViewGtk::UpdatePageActions() { WebContents* contents = GetWebContents(); if (!page_action_views_.empty() && contents) { - GURL url = browser()->GetActiveWebContents()->GetURL(); + GURL url = chrome::GetActiveWebContents(browser())->GetURL(); for (size_t i = 0; i < page_action_views_.size(); i++) { page_action_views_[i]->UpdateVisibility( diff --git a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc index 734e19b..245b9df 100644 --- a/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc +++ b/chrome/browser/ui/gtk/omnibox/omnibox_view_gtk.cc @@ -22,6 +22,7 @@ #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" @@ -1481,7 +1482,7 @@ void OmniboxViewGtk::HandleDragDataGet(GtkWidget* widget, break; } case ui::CHROME_NAMED_URL: { - WebContents* current_tab = browser_->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser_); string16 tab_title = current_tab->GetTitle(); // Pass an empty string if user has edited the URL. if (current_tab->GetURL().spec() != dragged_text_) diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc index 458c626..3180ffa 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc @@ -23,6 +23,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/gtk/browser_window_gtk.h" #include "chrome/browser/ui/gtk/custom_button.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" @@ -2198,7 +2199,7 @@ void TabStripGtk::OnNewTabClicked(GtkWidget* widget) { Browser* browser = window_->browser(); DCHECK(browser); - browser->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser, url, content::PAGE_TRANSITION_TYPED); break; } default: diff --git a/chrome/browser/ui/intents/web_intent_inline_disposition_delegate.cc b/chrome/browser/ui/intents/web_intent_inline_disposition_delegate.cc index 73979d6..ee0c2a5 100644 --- a/chrome/browser/ui/intents/web_intent_inline_disposition_delegate.cc +++ b/chrome/browser/ui/intents/web_intent_inline_disposition_delegate.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/intents/web_intent_picker.h" #include "chrome/common/extensions/extension_messages.h" #include "content/public/browser/navigation_controller.h" @@ -76,8 +77,8 @@ void WebIntentInlineDispositionDelegate::AddNewContents( // requested. disposition = disposition == NEW_BACKGROUND_TAB ? disposition : NEW_FOREGROUND_TAB; - browser->AddWebContents( - new_contents, disposition, initial_pos, user_gesture); + chrome::AddWebContents(browser, NULL, new_contents, disposition, initial_pos, + user_gesture); } void WebIntentInlineDispositionDelegate::LoadingStateChanged( diff --git a/chrome/browser/ui/intents/web_intent_picker_controller.cc b/chrome/browser/ui/intents/web_intent_picker_controller.cc index b3cae9b..f2b5966 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller.cc @@ -23,6 +23,7 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/intents/web_intent_picker.h" #include "chrome/browser/ui/intents/web_intent_picker_model.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -282,7 +283,7 @@ void WebIntentPickerController::OnServiceChosen(const GURL& url, case WebIntentPickerModel::DISPOSITION_WINDOW: { Browser* browser = browser::FindBrowserWithWebContents( tab_contents_->web_contents()); - TabContents* contents = Browser::TabContentsFactory( + TabContents* contents = chrome::TabContentsFactory( tab_contents_->profile(), tab_util::GetSiteInstanceForNewTab( tab_contents_->profile(), url), @@ -428,7 +429,7 @@ void WebIntentPickerController::OnSendReturnMessage( if (source_browser) { int source_index = source_browser->tab_strip_model()-> GetIndexOfTabContents(tab_contents_); - source_browser->ActivateTabAt(source_index, false); + chrome::ActivateTabAt(source_browser, source_index, false); } } service_tab_ = NULL; diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc index c853df5..a5021bd 100644 --- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc +++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc @@ -15,6 +15,7 @@ #include "chrome/browser/intents/default_web_intent_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/intents/web_intent_picker.h" #include "chrome/browser/ui/intents/web_intent_picker_controller.h" #include "chrome/browser/ui/intents/web_intent_picker_model.h" @@ -235,8 +236,8 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest { GetBrowser()->profile(), Profile::EXPLICIT_ACCESS); favicon_service_ = GetBrowser()->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS); - controller_ = GetBrowser()-> - GetActiveTabContents()->web_intent_picker_controller(); + controller_ = chrome::GetActiveTabContents(GetBrowser())-> + web_intent_picker_controller(); SetupMockPicker(); controller_->set_model_observer(&picker_); @@ -351,7 +352,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, ChooseService) { OnServiceChosen(kServiceURL2, WebIntentPickerModel::DISPOSITION_WINDOW); ASSERT_EQ(2, browser()->tab_count()); EXPECT_EQ(GURL(kServiceURL2), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); EXPECT_TRUE(dispatcher.dispatched_); @@ -390,14 +391,14 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, AddWebIntentService(kAction1, kServiceURL1); AddCWSExtensionServiceEmpty(kAction1); - GURL original = browser()->GetActiveWebContents()->GetURL(); + GURL original = chrome::GetActiveWebContents(browser())->GetURL(); // Open a new page, but keep focus on original. ui_test_utils::NavigateToURLWithDisposition( browser(), GURL(chrome::kChromeUINewTabURL), NEW_BACKGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); ASSERT_EQ(2, browser()->tab_count()); - EXPECT_EQ(original, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(original, chrome::GetActiveWebContents(browser())->GetURL()); controller_->ShowDialog(kAction1, kType1); picker_.Wait(); @@ -412,13 +413,13 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, OnServiceChosen(kServiceURL1, WebIntentPickerModel::DISPOSITION_WINDOW); ASSERT_EQ(3, browser()->tab_count()); EXPECT_EQ(GURL(kServiceURL1), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); EXPECT_TRUE(dispatcher.dispatched_); OnSendReturnMessage(webkit_glue::WEB_INTENT_REPLY_SUCCESS); ASSERT_EQ(2, browser()->tab_count()); - EXPECT_EQ(original, browser()->GetActiveWebContents()->GetURL()); + EXPECT_EQ(original, chrome::GetActiveWebContents(browser())->GetURL()); } class WebIntentPickerControllerIncognitoBrowserTest : @@ -596,7 +597,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, // The tab is shown immediately without needing to call OnServiceChosen. ASSERT_EQ(2, browser()->tab_count()); EXPECT_EQ(GURL(kServiceURL1), - browser()->GetActiveWebContents()->GetURL()); + chrome::GetActiveWebContents(browser())->GetURL()); EXPECT_TRUE(dispatcher.dispatched_); } diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc index 001142e..776332a 100644 --- a/chrome/browser/ui/login/login_prompt_browsertest.cc +++ b/chrome/browser/ui/login/login_prompt_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/login/login_prompt.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/chrome_notification_types.h" @@ -254,7 +255,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, PrefetchAuthCancels) { prerender::PrerenderManager::PrerenderManagerMode old_mode_; } set_prefetch_for_test(true); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; @@ -275,7 +276,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestBasicAuth) { ASSERT_TRUE(test_server()->Start()); GURL test_page = test_server()->GetURL(kAuthBasicPage); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; @@ -322,7 +323,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestDigestAuth) { ASSERT_TRUE(test_server()->Start()); GURL test_page = test_server()->GetURL(kAuthDigestPage); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; @@ -369,7 +370,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestDigestAuth) { IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestTwoAuths) { ASSERT_TRUE(test_server()->Start()); - content::WebContents* contents1 = browser()->GetActiveWebContents(); + content::WebContents* contents1 = chrome::GetActiveWebContents(browser()); NavigationController* controller1 = &contents1->GetController(); LoginPromptBrowserTestObserver observer; @@ -382,7 +383,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestTwoAuths) { NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); - content::WebContents* contents2 = browser()->GetActiveWebContents(); + content::WebContents* contents2 = chrome::GetActiveWebContents(browser()); ASSERT_NE(contents1, contents2); NavigationController* controller2 = &contents2->GetController(); observer.Register(content::Source<NavigationController>(controller2)); @@ -430,7 +431,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) { GURL no_auth_page_2 = test_server()->GetURL("b"); GURL no_auth_page_3 = test_server()->GetURL("c"); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; @@ -526,7 +527,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmCancellation) { ASSERT_TRUE(test_server()->Start()); GURL test_page = test_server()->GetURL(kMultiRealmTestPage); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; @@ -576,7 +577,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmConfirmation) { ASSERT_TRUE(test_server()->Start()); GURL test_page = test_server()->GetURL(kMultiRealmTestPage); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; @@ -626,7 +627,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, IncorrectConfirmation) { ASSERT_TRUE(test_server()->Start()); GURL test_page = test_server()->GetURL(kSingleRealmTestPage); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; @@ -695,7 +696,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, NoLoginPromptForFavicon) { ASSERT_TRUE(test_server()->Start()); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; @@ -750,7 +751,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, BlockCrossdomainPrompt) { host_resolver()->AddRule("www.b.com", "127.0.0.1"); ASSERT_TRUE(test_server()->Start()); - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); LoginPromptBrowserTestObserver observer; observer.Register(content::Source<NavigationController>(controller)); @@ -815,7 +816,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) { ASSERT_TRUE(test_server()->Start()); // Get NavigationController for tab 1. - content::WebContents* contents_1 = browser()->GetActiveWebContents(); + content::WebContents* contents_1 = chrome::GetActiveWebContents(browser()); NavigationController* controller_1 = &contents_1->GetController(); // Open a new tab. @@ -826,7 +827,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) { ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); // Get NavigationController for tab 2. - content::WebContents* contents_2 = browser()->GetActiveWebContents(); + content::WebContents* contents_2 = chrome::GetActiveWebContents(browser()); ASSERT_NE(contents_1, contents_2); NavigationController* controller_2 = &contents_2->GetController(); @@ -877,7 +878,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) { ASSERT_TRUE(test_server()->Start()); // Get NavigationController for tab 1. - content::WebContents* contents_1 = browser()->GetActiveWebContents(); + content::WebContents* contents_1 = chrome::GetActiveWebContents(browser()); NavigationController* controller_1 = &contents_1->GetController(); // Open a new tab. @@ -888,7 +889,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) { ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB); // Get NavigationController for tab 2. - content::WebContents* contents_2 = browser()->GetActiveWebContents(); + content::WebContents* contents_2 = chrome::GetActiveWebContents(browser()); ASSERT_NE(contents_1, contents_2); NavigationController* controller_2 = &contents_2->GetController(); @@ -940,7 +941,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, ASSERT_TRUE(test_server()->Start()); // Get NavigationController for regular tab. - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); NavigationController* controller = &contents->GetController(); // Open an incognito window. @@ -948,7 +949,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, // Get NavigationController for incognito tab. content::WebContents* contents_incognito = - browser_incognito->GetActiveWebContents(); + chrome::GetActiveWebContents(browser_incognito); ASSERT_NE(contents, contents_incognito); NavigationController* controller_incognito = &contents_incognito->GetController(); diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index d42420f..38e9c1a 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -22,6 +22,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#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/omnibox/omnibox_popup_model.h" @@ -583,9 +584,9 @@ class OmniboxViewTest : public InProcessBrowserTest, ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, ui::EF_CONTROL_DOWN, content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<content::NavigationController>( - &browser()->GetActiveWebContents()->GetController()))); + &chrome::GetActiveWebContents(browser())->GetController()))); - GURL url = browser()->GetActiveWebContents()->GetURL(); + GURL url = chrome::GetActiveWebContents(browser())->GetURL(); EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str()); } @@ -619,8 +620,8 @@ class OmniboxViewTest : public InProcessBrowserTest, ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0, content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<content::NavigationController>( - &browser()->GetActiveWebContents()->GetController()))); - GURL url = browser()->GetActiveWebContents()->GetURL(); + &chrome::GetActiveWebContents(browser())->GetController()))); + GURL url = chrome::GetActiveWebContents(browser())->GetURL(); EXPECT_STREQ(kSearchTextURL, url.spec().c_str()); // Test that entering a single character then Enter performs a search. @@ -639,8 +640,8 @@ class OmniboxViewTest : public InProcessBrowserTest, ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0, content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<content::NavigationController>( - &browser()->GetActiveWebContents()->GetController()))); - url = browser()->GetActiveWebContents()->GetURL(); + &chrome::GetActiveWebContents(browser())->GetController()))); + url = chrome::GetActiveWebContents(browser())->GetURL(); EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str()); } @@ -1240,7 +1241,7 @@ class OmniboxViewTest : public InProcessBrowserTest, chrome::NewTab(browser()); // Switch back to the first tab. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); // Make sure we're still in keyword mode. ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword())); diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc index 2e19a03..764a9e4 100644 --- a/chrome/browser/ui/panels/base_panel_browser_test.cc +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc @@ -13,6 +13,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/panels/native_panel.h" #include "chrome/browser/ui/panels/panel_manager.h" #include "chrome/browser/ui/panels/panel_mouse_watcher.h" @@ -396,7 +397,7 @@ NativePanelTesting* BasePanelBrowserTest::CreateNativePanelTesting( void BasePanelBrowserTest::CreateTestTabContents(Browser* browser) { TabContents* tab_contents = new TabContents( WebContentsTester::CreateTestWebContents(browser->profile(), NULL)); - browser->AddTab(tab_contents, content::PAGE_TRANSITION_LINK); + chrome::AddTab(browser, tab_contents, content::PAGE_TRANSITION_LINK); } scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension( diff --git a/chrome/browser/ui/panels/old_base_panel_browser_test.cc b/chrome/browser/ui/panels/old_base_panel_browser_test.cc index 1e6455a..41d7c01 100644 --- a/chrome/browser/ui/panels/old_base_panel_browser_test.cc +++ b/chrome/browser/ui/panels/old_base_panel_browser_test.cc @@ -15,6 +15,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/panels/native_panel.h" #include "chrome/browser/ui/panels/panel_browser_window.h" #include "chrome/browser/ui/panels/panel_manager.h" @@ -314,8 +315,8 @@ Panel* OldBasePanelBrowserTest::CreatePanelWithParams( ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - panel_browser->AddSelectedTabWithURL(params.url, - content::PAGE_TRANSITION_START_PAGE); + chrome::AddSelectedTabWithURL(panel_browser, params.url, + content::PAGE_TRANSITION_START_PAGE); observer.Wait(); } @@ -406,7 +407,7 @@ NativePanelTesting* OldBasePanelBrowserTest::CreateNativePanelTesting( void OldBasePanelBrowserTest::CreateTestTabContents(Browser* browser) { TabContents* tab_contents = new TabContents( WebContentsTester::CreateTestWebContents(browser->profile(), NULL)); - browser->AddTab(tab_contents, content::PAGE_TRANSITION_LINK); + chrome::AddTab(browser, tab_contents, content::PAGE_TRANSITION_LINK); } scoped_refptr<Extension> OldBasePanelBrowserTest::CreateExtension( diff --git a/chrome/browser/ui/panels/old_panel.cc b/chrome/browser/ui/panels/old_panel.cc index 762ec8d..6dba7ba 100644 --- a/chrome/browser/ui/panels/old_panel.cc +++ b/chrome/browser/ui/panels/old_panel.cc @@ -7,6 +7,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/panels/panel_browser_window.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -41,7 +42,7 @@ void OldPanel::Initialize(const gfx::Rect& bounds, Browser* browser) { } content::WebContents* OldPanel::WebContents() const { - return browser_->GetActiveWebContents(); + return chrome::GetActiveWebContents(browser_); } bool OldPanel::ShouldCloseWindow() { diff --git a/chrome/browser/ui/panels/old_panel_browsertest.cc b/chrome/browser/ui/panels/old_panel_browsertest.cc index 02be1e1..99c5de3 100644 --- a/chrome/browser/ui/panels/old_panel_browsertest.cc +++ b/chrome/browser/ui/panels/old_panel_browsertest.cc @@ -15,6 +15,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #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/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" @@ -1433,7 +1434,7 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, panel_browser->tab_strip_model()->InsertTabContentsAt( 0, contents, TabStripModel::ADD_NONE); chrome::SelectNumberedTab(panel_browser, 0); - EXPECT_EQ(contents, panel_browser->GetActiveTabContents()); + EXPECT_EQ(contents, chrome::GetActiveTabContents(panel_browser)); EXPECT_EQ(1, PanelManager::GetInstance()->num_panels()); // Ensure that the tab contents were noticed by the panel by @@ -1444,7 +1445,7 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED, content::Source<Panel>(panel)); EXPECT_TRUE(ui_test_utils::ExecuteJavaScript( - panel_browser->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(panel_browser)->GetRenderViewHost(), std::wstring(), L"changeSize(50);")); enlarge.Wait(); @@ -1459,7 +1460,7 @@ IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, EXPECT_EQ(0, PanelManager::GetInstance()->num_panels()); Browser* tabbed_browser = browser::FindTabbedBrowser(profile, false); - EXPECT_EQ(contents, tabbed_browser->GetActiveTabContents()); + EXPECT_EQ(contents, chrome::GetActiveTabContents(tabbed_browser)); tabbed_browser->window()->Close(); } diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc index 5cb4a70..d8f92e6 100644 --- a/chrome/browser/ui/panels/panel_browsertest.cc +++ b/chrome/browser/ui/panels/panel_browsertest.cc @@ -15,6 +15,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_finder.h" #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/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" @@ -1417,7 +1418,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_CreateWithExistingContents) { panel_browser->tab_strip_model()->InsertTabContentsAt( 0, contents, TabStripModel::ADD_NONE); chrome::SelectNumberedTab(panel_browser, 0); - EXPECT_EQ(contents, panel_browser->GetActiveTabContents()); + EXPECT_EQ(contents, chrome::GetActiveTabContents(panel_browser)); EXPECT_EQ(1, PanelManager::GetInstance()->num_panels()); // Ensure that the tab contents were noticed by the panel by @@ -1428,7 +1429,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_CreateWithExistingContents) { chrome::NOTIFICATION_PANEL_BOUNDS_ANIMATIONS_FINISHED, content::Source<Panel>(panel)); EXPECT_TRUE(ui_test_utils::ExecuteJavaScript( - panel_browser->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(panel_browser)->GetRenderViewHost(), std::wstring(), L"changeSize(50);")); enlarge.Wait(); @@ -1443,7 +1444,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_CreateWithExistingContents) { EXPECT_EQ(0, PanelManager::GetInstance()->num_panels()); Browser* tabbed_browser = browser::FindTabbedBrowser(profile, false); - EXPECT_EQ(contents, tabbed_browser->GetActiveTabContents()); + EXPECT_EQ(contents, chrome::GetActiveTabContents(tabbed_browser)); tabbed_browser->window()->Close(); } diff --git a/chrome/browser/ui/pdf/pdf_browsertest.cc b/chrome/browser/ui/pdf/pdf_browsertest.cc index 5a4b3d9..d7ffd2b 100644 --- a/chrome/browser/ui/pdf/pdf_browsertest.cc +++ b/chrome/browser/ui/pdf/pdf_browsertest.cc @@ -8,6 +8,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/snapshot_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -83,7 +84,7 @@ class PDFBrowserTest : public InProcessBrowserTest, void VerifySnapshot(const std::string& expected_filename) { snapshot_different_ = true; expected_filename_ = expected_filename; - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); tab_contents->snapshot_tab_helper()->CaptureSnapshot(); ui_test_utils::RegisterAndWait( this, @@ -107,7 +108,7 @@ class PDFBrowserTest : public InProcessBrowserTest, string16 query = UTF8ToUTF16( std::string("xyzxyz" + base::IntToString(next_dummy_search_value_++))); ASSERT_EQ(0, ui_test_utils::FindInPage( - browser()->GetActiveTabContents(), query, true, false, NULL)); + chrome::GetActiveTabContents(browser()), query, true, false, NULL)); } private: @@ -237,13 +238,13 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_Scroll) { wheel_event.type = WebKit::WebInputEvent::MouseWheel; wheel_event.deltaY = -200; wheel_event.wheelTicksY = -2; - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); web_contents->GetRenderViewHost()->ForwardWheelEvent(wheel_event); ASSERT_NO_FATAL_FAILURE(WaitForResponse()); int y_offset = 0; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), std::wstring(), L"window.domAutomationController.send(plugin.pageYOffset())", &y_offset)); @@ -260,7 +261,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) { ASSERT_NO_FATAL_FAILURE(Load()); // Verifies that find in page works. ASSERT_EQ(3, ui_test_utils::FindInPage( - browser()->GetActiveTabContents(), UTF8ToUTF16("adipiscing"), + chrome::GetActiveTabContents(browser()), UTF8ToUTF16("adipiscing"), true, false, NULL)); // Verify that copying selected text works. @@ -272,7 +273,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, MAYBE_FindAndCopy) { objects[ui::Clipboard::CBF_TEXT] = params; clipboard.WriteObjects(ui::Clipboard::BUFFER_STANDARD, objects); - browser()->GetActiveWebContents()->GetRenderViewHost()->Copy(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost()->Copy(); ASSERT_NO_FATAL_FAILURE(WaitForResponse()); std::string text; @@ -288,7 +289,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, SLOW_Loading) { ASSERT_TRUE(pdf_test_server()->Start()); NavigationController* controller = - &(browser()->GetActiveWebContents()->GetController()); + &(chrome::GetActiveWebContents(browser())->GetController()); content::NotificationRegistrar registrar; registrar.Add(this, content::NOTIFICATION_LOAD_STOP, @@ -323,7 +324,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, SLOW_Loading) { // and before creating a byte-range request loader. bool complete = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), std::wstring(), L"window.domAutomationController.send(plugin.documentLoadComplete())", &complete)); @@ -334,7 +335,7 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, SLOW_Loading) { // nested message loop for the JS call. if (last_count != load_stop_notification_count()) continue; - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); } } } @@ -349,14 +350,15 @@ IN_PROC_BROWSER_TEST_F(PDFBrowserTest, DISABLED_OnLoadAndReload) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), std::wstring(), L"reloadPDF();")); observer.Wait(); - ASSERT_EQ("success", browser()->GetActiveWebContents()->GetURL().query()); + ASSERT_EQ("success", + chrome::GetActiveWebContents(browser())->GetURL().query()); } } // namespace diff --git a/chrome/browser/ui/search/search_delegate_unittest.cc b/chrome/browser/ui/search/search_delegate_unittest.cc index 382aac5..529bda1 100644 --- a/chrome/browser/ui/search/search_delegate_unittest.cc +++ b/chrome/browser/ui/search/search_delegate_unittest.cc @@ -4,6 +4,7 @@ #include "base/command_line.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/search/search_model.h" #include "chrome/browser/ui/search/search_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -26,21 +27,21 @@ TEST_F(SearchDelegateTest, SearchModel) { // Propagate change from tab's search model to browser's search model. AddTab(browser(), GURL("http://foo/0")); - TabContents* contents = browser()->GetTabContentsAt(0); + TabContents* contents = chrome::GetTabContentsAt(browser(), 0); contents->search_tab_helper()->model()->SetMode(Mode(Mode::MODE_NTP, false)); EXPECT_TRUE(browser()->search_model()->mode().is_ntp()); // Add second tab, make it active, and make sure its mode changes // propagate to the browser's search model. AddTab(browser(), GURL("http://foo/1")); - browser()->ActivateTabAt(1, true); - contents = browser()->GetTabContentsAt(1); + chrome::ActivateTabAt(browser(), 1, true); + contents = chrome::GetTabContentsAt(browser(), 1); contents->search_tab_helper()->model()->SetMode( Mode(Mode::MODE_SEARCH, false)); EXPECT_TRUE(browser()->search_model()->mode().is_search()); // The first tab is not active so changes should not propagate. - contents = browser()->GetTabContentsAt(0); + contents = chrome::GetTabContentsAt(browser(), 0); contents->search_tab_helper()->model()->SetMode(Mode(Mode::MODE_NTP, false)); EXPECT_TRUE(browser()->search_model()->mode().is_search()); } diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc index f268720..11b7baa 100644 --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc @@ -7,6 +7,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/url_constants.h" #include "content/public/browser/browser_url_handler.h" @@ -44,7 +45,7 @@ void ShowSingletonTabRespectRef(Browser* browser, const GURL& url) { void ShowSingletonTabOverwritingNTP(Browser* browser, const browser::NavigateParams& params) { browser::NavigateParams local_params(params); - content::WebContents* contents = browser->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser); if (contents) { const GURL& contents_url = contents->GetURL(); if ((contents_url == GURL(chrome::kChromeUINewTabURL) || @@ -89,7 +90,7 @@ int GetIndexOfSingletonTab(browser::NavigateParams* params) { int tab_count = params->browser->tab_count(); for (int i = 0; i < tab_count; ++i) { int tab_index = (start_index + i) % tab_count; - TabContents* tab = params->browser->GetTabContentsAt(tab_index); + TabContents* tab = chrome::GetTabContentsAt(params->browser, tab_index); url_canon::Replacements<char> replacements; if (params->ref_behavior == browser::NavigateParams::IGNORE_REF) diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc index 9c3caa9..34b9307 100644 --- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc +++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc @@ -15,6 +15,7 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/browser.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/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" @@ -154,7 +155,7 @@ void CheckAutoLaunchCallback(Profile* profile) { // We must not use GetLastActive here because this is at Chrome startup and // no window might have been made active yet. We'll settle for any window. Browser* browser = browser::FindAnyBrowser(profile, true); - TabContents* tab = browser->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser); // Don't show the info-bar if there are already info-bars showing. InfoBarTabHelper* infobar_helper = tab->infobar_tab_helper(); diff --git a/chrome/browser/ui/startup/bad_flags_prompt.cc b/chrome/browser/ui/startup/bad_flags_prompt.cc index 86f3c2f..c344035 100644 --- a/chrome/browser/ui/startup/bad_flags_prompt.cc +++ b/chrome/browser/ui/startup/bad_flags_prompt.cc @@ -10,6 +10,7 @@ #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/tab_contents/simple_alert_infobar_delegate.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -37,7 +38,7 @@ void ShowBadFlagsPrompt(Browser* browser) { } if (bad_flag) { - TabContents* tab = browser->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser); if (!tab) return; tab->infobar_tab_helper()->AddInfoBar( diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc index 273974c..669e0e2 100644 --- a/chrome/browser/ui/startup/default_browser_prompt.cc +++ b/chrome/browser/ui/startup/default_browser_prompt.cc @@ -16,6 +16,7 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #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/common/pref_names.h" #include "content/public/browser/browser_thread.h" @@ -220,7 +221,7 @@ void NotifyNotDefaultBrowserCallback() { // In ChromeBot tests, there might be a race. This line appears to get // called during shutdown and |tab| can be NULL. - TabContents* tab = browser->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser); if (!tab) return; diff --git a/chrome/browser/ui/startup/obsolete_os_prompt_gtk.cc b/chrome/browser/ui/startup/obsolete_os_prompt_gtk.cc index d0e979a..917cbdf 100644 --- a/chrome/browser/ui/startup/obsolete_os_prompt_gtk.cc +++ b/chrome/browser/ui/startup/obsolete_os_prompt_gtk.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/startup/obsolete_os_info_bar.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -30,7 +31,7 @@ void ShowObsoleteOSPrompt(Browser* browser) { // Link to an article in the help center on minimum system requirements. const char* kLearnMoreURL = "http://www.google.com/support/chrome/bin/answer.py?answer=95411"; - TabContents* tab = browser->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser); if (!tab) return; tab->infobar_tab_helper()->AddInfoBar( diff --git a/chrome/browser/ui/startup/obsolete_os_prompt_mac.cc b/chrome/browser/ui/startup/obsolete_os_prompt_mac.cc index 1f88d1b..e157cc5 100644 --- a/chrome/browser/ui/startup/obsolete_os_prompt_mac.cc +++ b/chrome/browser/ui/startup/obsolete_os_prompt_mac.cc @@ -9,6 +9,7 @@ #include "chrome/browser/infobars/infobar_tab_helper.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/cocoa/obsolete_os.h" #include "chrome/browser/ui/startup/obsolete_os_info_bar.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -45,7 +46,7 @@ void ShowObsoleteOSPrompt(Browser* browser) { return; } - TabContents* tab = browser->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser); if (!tab) return; tab->infobar_tab_helper()->AddInfoBar( diff --git a/chrome/browser/ui/startup/session_crashed_prompt.cc b/chrome/browser/ui/startup/session_crashed_prompt.cc index 2037fcf..d4b9c9a 100644 --- a/chrome/browser/ui/startup/session_crashed_prompt.cc +++ b/chrome/browser/ui/startup/session_crashed_prompt.cc @@ -11,6 +11,7 @@ #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "grit/chromium_strings.h" @@ -72,7 +73,7 @@ bool SessionCrashedInfoBarDelegate::Accept() { Browser* browser = browser::FindBrowserWithWebContents(owner()->web_contents()); if (browser->tab_count() == 1 && - browser->GetWebContentsAt(0)->GetURL() == + chrome::GetWebContentsAt(browser, 0)->GetURL() == GURL(chrome::kChromeUINewTabURL)) { // There is only one tab and its the new tab page, make session restore // clobber it. @@ -96,7 +97,7 @@ void ShowSessionCrashedPrompt(Browser* browser) { // In ChromeBot tests, there might be a race. This line appears to get // called during shutdown and |tab| can be NULL. - TabContents* tab = browser->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser); if (!tab) return; diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc index 833c19a..1d602ee 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc @@ -19,6 +19,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #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/startup/startup_browser_creator.h" #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" @@ -183,13 +184,13 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, // The new browser should have one tab for each URL. ASSERT_EQ(static_cast<int>(urls.size()), new_browser->tab_count()); for (size_t i=0; i < urls.size(); i++) { - EXPECT_EQ(urls[i], new_browser->GetWebContentsAt(i)->GetURL()); + EXPECT_EQ(urls[i], chrome::GetWebContentsAt(new_browser, i)->GetURL()); } // The two tabs, despite having the same site, should be in different // SiteInstances. - EXPECT_NE(new_browser->GetWebContentsAt(0)->GetSiteInstance(), - new_browser->GetWebContentsAt(1)->GetSiteInstance()); + EXPECT_NE(chrome::GetWebContentsAt(new_browser, 0)->GetSiteInstance(), + chrome::GetWebContentsAt(new_browser, 1)->GetSiteInstance()); } // Verify that startup URLs aren't used when the process already exists @@ -423,13 +424,13 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, StartupURLsForTwoProfiles) { new_browser = FindOneOtherBrowserForProfile(default_profile, browser()); ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); - EXPECT_EQ(urls1[0], new_browser->GetWebContentsAt(0)->GetURL()); + EXPECT_EQ(urls1[0], chrome::GetWebContentsAt(new_browser, 0)->GetURL()); ASSERT_EQ(1u, browser::GetBrowserCount(other_profile)); new_browser = FindOneOtherBrowserForProfile(other_profile, NULL); ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); - EXPECT_EQ(urls2[0], new_browser->GetWebContentsAt(0)->GetURL()); + EXPECT_EQ(urls2[0], chrome::GetWebContentsAt(new_browser, 0)->GetURL()); } IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, UpdateWithTwoProfiles) { @@ -494,14 +495,14 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, UpdateWithTwoProfiles) { ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); EXPECT_EQ(GURL(chrome::kAboutBlankURL), - new_browser->GetWebContentsAt(0)->GetURL()); + chrome::GetWebContentsAt(new_browser, 0)->GetURL()); ASSERT_EQ(1u, browser::GetBrowserCount(profile2)); new_browser = FindOneOtherBrowserForProfile(profile2, NULL); ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); EXPECT_EQ(GURL(chrome::kAboutBlankURL), - new_browser->GetWebContentsAt(0)->GetURL()); + chrome::GetWebContentsAt(new_browser, 0)->GetURL()); } IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, @@ -579,14 +580,14 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), - new_browser->GetWebContentsAt(0)->GetURL()); + chrome::GetWebContentsAt(new_browser, 0)->GetURL()); // profile_urls opened the urls. ASSERT_EQ(1u, browser::GetBrowserCount(profile_urls)); new_browser = FindOneOtherBrowserForProfile(profile_urls, NULL); ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); - EXPECT_EQ(urls[0], new_browser->GetWebContentsAt(0)->GetURL()); + EXPECT_EQ(urls[0], chrome::GetWebContentsAt(new_browser, 0)->GetURL()); // profile_last opened the last open pages. ASSERT_EQ(1u, browser::GetBrowserCount(profile_last)); @@ -594,7 +595,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); EXPECT_EQ(GURL(chrome::kAboutBlankURL), - new_browser->GetWebContentsAt(0)->GetURL()); + chrome::GetWebContentsAt(new_browser, 0)->GetURL()); // profile_home2 was not launched since it would've only opened the home page. ASSERT_EQ(0u, browser::GetBrowserCount(profile_home2)); @@ -666,8 +667,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) { ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), - new_browser->GetWebContentsAt(0)->GetURL()); - EXPECT_EQ(1U, new_browser->GetTabContentsAt(0)->infobar_tab_helper()-> + chrome::GetWebContentsAt(new_browser, 0)->GetURL()); + EXPECT_EQ(1U, chrome::GetTabContentsAt(new_browser, 0)->infobar_tab_helper()-> infobar_count()); // The profile which normally opens last open pages displays the new tab page. @@ -676,8 +677,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) { ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), - new_browser->GetWebContentsAt(0)->GetURL()); - EXPECT_EQ(1U, new_browser->GetTabContentsAt(0)->infobar_tab_helper()-> + chrome::GetWebContentsAt(new_browser, 0)->GetURL()); + EXPECT_EQ(1U, chrome::GetTabContentsAt(new_browser, 0)->infobar_tab_helper()-> infobar_count()); // The profile which normally opens URLs displays the new tab page. @@ -686,8 +687,8 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) { ASSERT_TRUE(new_browser); ASSERT_EQ(1, new_browser->tab_count()); EXPECT_EQ(GURL(chrome::kChromeUINewTabURL), - new_browser->GetWebContentsAt(0)->GetURL()); - EXPECT_EQ(1U, new_browser->GetTabContentsAt(0)->infobar_tab_helper()-> + chrome::GetWebContentsAt(new_browser, 0)->GetURL()); + EXPECT_EQ(1U, chrome::GetTabContentsAt(new_browser, 0)->infobar_tab_helper()-> infobar_count()); } #endif // !OS_CHROMEOS diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 91c8aa4..13fd311 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -44,6 +44,8 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabrestore.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/startup/autolaunch_prompt.h" @@ -696,7 +698,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(Browser* browser, add_types |= TabStripModel::ADD_FORCE_INDEX; if (tabs[i].is_pinned) add_types |= TabStripModel::ADD_PINNED; - int index = browser->GetIndexForInsertionDuringRestore(i); + int index = chrome::GetIndexForInsertionDuringRestore(browser, i); browser::NavigateParams params(browser, tabs[i].url, content::PAGE_TRANSITION_START_PAGE); @@ -709,18 +711,18 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(Browser* browser, first_tab = false; } - if (!browser->GetActiveWebContents()) { + if (!chrome::GetActiveWebContents(browser)) { // TODO: this is a work around for 110909. Figure out why it's needed. if (!browser->tab_count()) browser->AddBlankTab(true); else - browser->ActivateTabAt(0, false); + chrome::ActivateTabAt(browser, 0, false); } browser->window()->Show(); // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial // focus explicitly. - browser->GetActiveWebContents()->GetView()->SetInitialFocus(); + chrome::GetActiveWebContents(browser)->GetView()->SetInitialFocus(); return browser; } diff --git a/chrome/browser/ui/sync/browser_synced_window_delegate.cc b/chrome/browser/ui/sync/browser_synced_window_delegate.cc index 905d5f6..e464726 100644 --- a/chrome/browser/ui/sync/browser_synced_window_delegate.cc +++ b/chrome/browser/ui/sync/browser_synced_window_delegate.cc @@ -10,6 +10,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -47,9 +48,9 @@ bool BrowserSyncedWindowDelegate::IsTabPinned( const browser_sync::SyncedTabDelegate* tab) const { for (int i = 0; i < browser_->tab_count(); i++) { browser_sync::SyncedTabDelegate* current = - browser_->GetTabContentsAt(i)->synced_tab_delegate(); + chrome::GetTabContentsAt(browser_, i)->synced_tab_delegate(); if (tab == current) - return browser_->IsTabPinned(i); + return browser_->tab_strip_model()->IsTabPinned(i); } NOTREACHED(); return false; @@ -57,7 +58,7 @@ bool BrowserSyncedWindowDelegate::IsTabPinned( browser_sync::SyncedTabDelegate* BrowserSyncedWindowDelegate::GetTabAt( int index) const { - return browser_->GetTabContentsAt(index)->synced_tab_delegate(); + return chrome::GetTabContentsAt(browser_, index)->synced_tab_delegate(); } SessionID::id_type BrowserSyncedWindowDelegate::GetTabIdAt(int index) const { diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator.cc index 8d9de65..12f256ef 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_iterator.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_iterator.cc @@ -7,6 +7,7 @@ #include "base/logging.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/printing/background_printing_manager.h" namespace { @@ -41,7 +42,7 @@ void TabContentsIterator::Advance() { } TabContents* next_tab = - (*browser_iterator_)->GetTabContentsAt(web_view_index_); + chrome::GetTabContentsAt(*browser_iterator_, web_view_index_); if (next_tab) { cur_ = next_tab; return; diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc index 93a24f9..6d67a43 100644 --- a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/printing/background_printing_manager.h" #include "chrome/browser/profiles/profile_manager.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/pref_names.h" #include "chrome/common/url_constants.h" @@ -78,7 +79,7 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) { EXPECT_EQ(4U, CountAllTabs()); // Close some tabs. - browser2->CloseAllTabs(); + chrome::CloseAllTabs(browser2.get()); EXPECT_EQ(1U, CountAllTabs()); @@ -88,7 +89,7 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyCount) { EXPECT_EQ(42U, CountAllTabs()); // Close all remaining tabs to keep all the destructors happy. - browser3->CloseAllTabs(); + chrome::CloseAllTabs(browser3.get()); } TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) { @@ -129,7 +130,7 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) { } // Close some tabs. - browser2->CloseAllTabs(); + chrome::CloseAllTabs(browser2.get()); count = 0; for (TabContentsIterator iterator; !iterator.done(); ++iterator, ++count) { @@ -156,8 +157,8 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) { } // Close all remaining tabs to keep all the destructors happy. - browser2->CloseAllTabs(); - browser3->CloseAllTabs(); + chrome::CloseAllTabs(browser2.get()); + chrome::CloseAllTabs(browser3.get()); } #if 0 @@ -201,8 +202,8 @@ TEST_F(BrowserListTest, TabContentsIteratorBackgroundPrinting) { EXPECT_EQ(4U, CountAllTabs()); // Close remaining tabs. - browser2->CloseAllTabs(); - browser3->CloseAllTabs(); + chrome::CloseAllTabs(browser2.get()); + chrome::CloseAllTabs(browser3.get()); EXPECT_EQ(1U, CountAllTabs()); diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc index 8b1f30e..03d7d97 100644 --- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc +++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc @@ -7,8 +7,9 @@ #include "base/bind.h" #include "base/utf_string_conversions.h" #include "chrome/browser/lifetime/application_lifetime.h" -#include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_dialogs.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" #include "chrome/test/base/ui_test_utils.h" #include "testing/gmock/include/gmock/gmock.h" @@ -39,9 +40,9 @@ TabModalConfirmDialogTest::TabModalConfirmDialogTest() void TabModalConfirmDialogTest::SetUpOnMainThread() { delegate_ = new MockTabModalConfirmDialogDelegate( - browser()->GetActiveWebContents()); + chrome::GetActiveWebContents(browser())); dialog_ = CreateTestDialog(delegate_, - browser()->GetActiveTabContents()); + chrome::GetActiveTabContents(browser())); ui_test_utils::RunAllPendingInMessageLoop(); } diff --git a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc index be65ac9..2e57b7a 100644 --- a/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc +++ b/chrome/browser/ui/tabs/pinned_tab_service_unittest.cc @@ -6,6 +6,7 @@ #include <vector> #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/tabs/pinned_tab_codec.h" #include "chrome/browser/ui/tabs/pinned_tab_service.h" #include "chrome/browser/ui/tabs/pinned_tab_service_factory.h" @@ -65,7 +66,7 @@ TEST_F(PinnedTabServiceTest, Popup) { EXPECT_EQ("http://www.google.com/::pinned:", result); // Close the popup. This shouldn't reset the saved state. - popup->CloseAllTabs(); + chrome::CloseAllTabs(popup.get()); popup.reset(NULL); popup_window.reset(NULL); diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc index 4db7864..5a0bf19 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc @@ -380,17 +380,6 @@ int TabStripModel::GetIndexOfWebContents(const WebContents* contents) const { return kNoTab; } -int TabStripModel::GetIndexOfController( - const NavigationController* controller) const { - int index = 0; - TabContentsDataVector::const_iterator iter = contents_data_.begin(); - for (; iter != contents_data_.end(); ++iter, ++index) { - if (&(*iter)->contents->web_contents()->GetController() == controller) - return index; - } - return kNoTab; -} - void TabStripModel::UpdateTabContentsStateAt(int index, TabStripModelObserver::TabChangeType change_type) { DCHECK(ContainsIndex(index)); diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h index e1857a4..ece3bf4 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h @@ -294,11 +294,6 @@ class TabStripModel : public content::NotificationObserver { // model. int GetIndexOfWebContents(const content::WebContents* contents) const; - // Returns the index of the specified NavigationController, or kNoTab if it is - // not in this TabStripModel. - int GetIndexOfController( - const content::NavigationController* controller) const; - // Notify any observers that the TabContents at the specified index has // changed in some way. See TabChangeType for details of |change_type|. void UpdateTabContentsStateAt( diff --git a/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc b/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc index 7a474af..0b4d57e 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_order_controller.cc @@ -98,7 +98,7 @@ int TabStripModelOrderController::DetermineNewSelectedIndex( // If we can't find a subsequent group member, just fall back to the // parent_opener itself. Note that we use "group" here since opener is // reset by select operations.. - index = tabstrip_->GetIndexOfController(parent_opener); + index = tabstrip_->GetIndexOfWebContents(parent_opener->GetWebContents()); if (index != TabStripModel::kNoTab) return GetValidIndex(index, removing_index); } diff --git a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc index df9d116..d9362d9 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_strip_model_unittest.cc @@ -21,6 +21,7 @@ #include "chrome/browser/extensions/extension_tab_helper.h" #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_delegate.h" #include "chrome/browser/ui/tabs/tab_strip_model_order_controller.h" @@ -122,13 +123,13 @@ class TabStripModelTest : public ChromeRenderViewHostTestHarness { } TabContents* CreateTabContents() { - return Browser::TabContentsFactory( + return chrome::TabContentsFactory( profile(), NULL, MSG_ROUTING_NONE, NULL, NULL); } TabContents* CreateTabContentsWithSharedRPH( WebContents* web_contents) { - TabContents* retval = Browser::TabContentsFactory(profile(), + TabContents* retval = chrome::TabContentsFactory(profile(), web_contents->GetRenderViewHost()->GetSiteInstance(), MSG_ROUTING_NONE, NULL, NULL); EXPECT_EQ(retval->web_contents()->GetRenderProcessHost(), @@ -570,10 +571,8 @@ TEST_F(TabStripModelTest, TestBasicAPI) { EXPECT_EQ(contents1, tabstrip.GetTabContentsAt(1)); EXPECT_EQ(0, tabstrip.GetIndexOfTabContents(contents2)); EXPECT_EQ(1, tabstrip.GetIndexOfTabContents(contents1)); - EXPECT_EQ(0, tabstrip.GetIndexOfController( - &contents2->web_contents()->GetController())); - EXPECT_EQ(1, tabstrip.GetIndexOfController( - &contents1->web_contents()->GetController())); + EXPECT_EQ(0, tabstrip.GetIndexOfWebContents(contents2->web_contents())); + EXPECT_EQ(1, tabstrip.GetIndexOfWebContents(contents1->web_contents())); } // Test UpdateTabContentsStateAt diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 80db712..431a9d7 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -14,6 +14,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/singleton_tabs.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" @@ -416,7 +417,7 @@ WebContents* BackForwardMenuModel::GetWebContents() const { // We use the test web contents if the unit test has specified it. return test_web_contents_ ? test_web_contents_ : - browser_->GetActiveWebContents(); + chrome::GetActiveWebContents(browser_); } int BackForwardMenuModel::MenuIndexToNavEntryIndex(int index) const { diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc index fd5b44a..7e1dda1 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc @@ -11,6 +11,7 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" @@ -560,7 +561,7 @@ TEST_F(BackFwdMenuModelTest, FaviconLoadTest) { new_icon_bitmap.getSize())); // Make sure the browser deconstructor doesn't have problems. - browser.CloseAllTabs(); + chrome::CloseAllTabs(&browser); // This is required to prevent the message loop from hanging. profile()->DestroyHistoryService(); } diff --git a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc index ea46d4a..5c1e49d 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_unittest.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_unittest.cc @@ -6,6 +6,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/web_contents.h" @@ -23,7 +24,7 @@ class ToolbarModelTest : public BrowserWithTestWindowTest { void NavigateAndCheckText(const std::string& url, const std::string& expected_text, bool should_display) { - WebContents* contents = browser()->GetWebContentsAt(0); + WebContents* contents = chrome::GetWebContentsAt(browser(), 0); browser()->OpenURL(OpenURLParams( GURL(url), Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false)); diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 4a3e3a7..7dfdb2c 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -27,6 +27,7 @@ #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/global_error/global_error.h" #include "chrome/browser/ui/global_error/global_error_service.h" @@ -110,7 +111,7 @@ void EncodingMenuModel::Build() { } bool EncodingMenuModel::IsCommandIdChecked(int command_id) const { - WebContents* current_tab = browser_->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser_); if (!current_tab) return false; EncodingMenuController controller; @@ -612,8 +613,8 @@ void WrenchMenuModel::UpdateZoomControls() { bool enable_increment = false; bool enable_decrement = false; int zoom_percent = 100; - if (browser_->GetActiveWebContents()) { - zoom_percent = browser_->GetActiveWebContents()->GetZoomPercent( + if (chrome::GetActiveWebContents(browser_)) { + zoom_percent = chrome::GetActiveWebContents(browser_)->GetZoomPercent( &enable_increment, &enable_decrement); } zoom_label_ = l10n_util::GetStringFUTF16( diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc index aea70e6..c3472c1 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc @@ -6,6 +6,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/global_error/global_error.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" @@ -199,6 +200,6 @@ class EncodingMenuModelTest : public BrowserWithTestWindowTest, TEST_F(EncodingMenuModelTest, IsCommandIdCheckedWithNoTabs) { EncodingMenuModel model(browser()); - ASSERT_EQ(NULL, browser()->GetActiveWebContents()); + ASSERT_EQ(NULL, chrome::GetActiveWebContents(browser())); EXPECT_FALSE(model.IsCommandIdChecked(IDC_ENCODING_ISO88591)); } diff --git a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc index cc76737..4472201 100644 --- a/chrome/browser/ui/views/ash/app_list/extension_app_item.cc +++ b/chrome/browser/ui/views/ash/app_list/extension_app_item.cc @@ -13,6 +13,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/ash/extension_utils.h" #include "chrome/browser/ui/views/ash/launcher/chrome_launcher_controller.h" @@ -171,8 +172,8 @@ void ExtensionAppItem::ShowExtensionOptions() { browser->window()->Show(); } - browser->AddSelectedTabWithURL(extension->options_url(), - content::PAGE_TRANSITION_LINK); + chrome::AddSelectedTabWithURL(browser, extension->options_url(), + content::PAGE_TRANSITION_LINK); browser->window()->Activate(); } diff --git a/chrome/browser/ui/views/ash/app_list/search_builder.cc b/chrome/browser/ui/views/ash/app_list/search_builder.cc index 31c0cf6..f3c4bef 100644 --- a/chrome/browser/ui/views/ash/app_list/search_builder.cc +++ b/chrome/browser/ui/views/ash/app_list/search_builder.cc @@ -18,6 +18,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/views/ash/extension_utils.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_icon_set.h" @@ -242,8 +243,8 @@ void SearchBuilder::OpenResult(const app_list::SearchResult& result, if (disposition == CURRENT_TAB) { // If current tab is not NTP, change disposition to NEW_FOREGROUND_TAB. - const GURL& url = browser->GetActiveWebContents() ? - browser->GetActiveWebContents()->GetURL() : GURL(); + const GURL& url = chrome::GetActiveWebContents(browser) ? + chrome::GetActiveWebContents(browser)->GetURL() : GURL(); if (!url.SchemeIs(chrome::kChromeUIScheme) || url.host() != chrome::kChromeUINewTabHost) { disposition = NEW_FOREGROUND_TAB; diff --git a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc index 83b8615..0d36e3a 100644 --- a/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc +++ b/chrome/browser/ui/views/ash/launcher/launcher_favicon_loader_browsertest.cc @@ -7,6 +7,7 @@ #include "base/file_path.h" #include "base/time.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/views/ash/launcher/browser_launcher_item_controller.h" #include "chrome/browser/ui/views/ash/launcher/launcher_favicon_loader.h" #include "chrome/browser/ui/views/frame/browser_view.h" @@ -86,7 +87,7 @@ class LauncherFaviconLoaderBrowsertest : public InProcessBrowserTest { // Load initial tab contents before setting the observer. ui_test_utils::NavigateToURL(panel_browser, GURL()); contents_observer_.reset( - new ContentsObserver(panel_browser->GetWebContentsAt(0))); + new ContentsObserver(chrome::GetWebContentsAt(panel_browser, 0))); NavigateTo(panel_browser, url); *result = panel_browser; } diff --git a/chrome/browser/ui/views/ash/panel_view_aura.cc b/chrome/browser/ui/views/ash/panel_view_aura.cc index a538c6c..17df784 100644 --- a/chrome/browser/ui/views/ash/panel_view_aura.cc +++ b/chrome/browser/ui/views/ash/panel_view_aura.cc @@ -17,6 +17,7 @@ #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/view_type_utils.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_messages.h" @@ -145,9 +146,10 @@ void PanelHost::AddNewContents(content::WebContents* source, bool user_gesture) { Browser* browser = browser::FindLastActiveWithProfile( Profile::FromBrowserContext(new_contents->GetBrowserContext())); - if (!browser) - return; - browser->AddWebContents(new_contents, disposition, initial_pos, user_gesture); + if (browser) { + chrome::AddWebContents(browser, NULL, new_contents, disposition, + initial_pos, user_gesture); + } } void PanelHost::RenderViewCreated(content::RenderViewHost* render_view_host) { diff --git a/chrome/browser/ui/views/ash/user_action_handler.cc b/chrome/browser/ui/views/ash/user_action_handler.cc index b4b77a2..ce1daa2 100644 --- a/chrome/browser/ui/views/ash/user_action_handler.cc +++ b/chrome/browser/ui/views/ash/user_action_handler.cc @@ -7,6 +7,7 @@ #include "ash/wm/window_util.h" #include "chrome/browser/ui/browser.h" #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 "content/public/browser/web_contents.h" @@ -20,7 +21,7 @@ content::WebContents* GetActiveWebContents() { if (!ash::wm::IsActiveWindow(browser->window()->GetNativeWindow())) return NULL; - return browser->GetActiveWebContents(); + return chrome::GetActiveWebContents(browser); } UserActionHandler::UserActionHandler() {} diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index 88d6e30..4e192e1 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -27,6 +27,7 @@ #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/view_ids.h" @@ -1092,7 +1093,7 @@ void BookmarkBarView::ShowContextMenuForView(views::View* source, (parent == profile->GetBookmarkModel()->other_node()) && (parent->child_count() == 1); context_menu_.reset(new BookmarkContextMenu(GetWidget(), browser_, profile, - browser_->GetActiveWebContents(), parent, nodes, close_on_remove)); + chrome::GetActiveWebContents(browser_), parent, nodes, close_on_remove)); context_menu_->RunMenuAt(point); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 2b49dbe..b66dc06 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -13,6 +13,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" #include "chrome/common/chrome_notification_types.h" @@ -216,7 +217,7 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { virtual void TearDown() { // Destroy everything, then run the message loop to ensure we delete all // Tasks and fully shut down. - browser_->CloseAllTabs(); + chrome::CloseAllTabs(browser_.get()); bb_view_.reset(); browser_.reset(); profile_.reset(); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc index 9a4a615..15a51ca 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc @@ -13,6 +13,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/common/pref_names.h" #include "content/public/browser/page_navigator.h" @@ -114,7 +115,7 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) { GURL url; string16 title; bookmark_utils::GetURLAndTitleToBookmark( - browser_->GetActiveWebContents(), &url, &title); + chrome::GetActiveWebContents(browser_), &url, &title); BookmarkEditor::Show( parent_widget_->GetNativeWindow(), profile_, diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index ce923b2..5742cb0 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -10,6 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/restore_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/view_ids.h" #include "chrome/browser/ui/views/browser_action_view.h" @@ -128,7 +129,7 @@ void BrowserActionsContainer::Init() { } int BrowserActionsContainer::GetCurrentTabId() const { - TabContents* tab = browser_->GetActiveTabContents(); + TabContents* tab = chrome::GetActiveTabContents(browser_); return tab ? tab->restore_tab_helper()->session_id().id() : -1; } diff --git a/chrome/browser/ui/views/constrained_window_views_browsertest.cc b/chrome/browser/ui/views/constrained_window_views_browsertest.cc index 7e47b86..38d3dba 100644 --- a/chrome/browser/ui/views/constrained_window_views_browsertest.cc +++ b/chrome/browser/ui/views/constrained_window_views_browsertest.cc @@ -5,6 +5,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/views/constrained_window_views.h" @@ -105,7 +106,7 @@ class ConstrainedWindowViewTest : public InProcessBrowserTest { // *) Constrained windows that are queued don't register themselves as // accelerator targets until they are displayed. IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(tab_contents != NULL); ConstrainedWindowTabHelper* constrained_window_helper = tab_contents->constrained_window_tab_helper(); @@ -160,7 +161,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWindowViewTest, FocusTest) { EXPECT_NE(test_dialog2->GetInitiallyFocusedView(), focus_manager->GetFocusedView()); - browser()->ActivateTabAt(tab_with_constrained_window, false); + chrome::ActivateTabAt(browser(), tab_with_constrained_window, false); // Activating the previous tab should bring focus to the constrained window. EXPECT_EQ(test_dialog2->GetInitiallyFocusedView(), diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index 24bc4bd..2f14ccd 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -7,6 +7,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -86,17 +87,17 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_CrashEscHandlers) { chrome::Find(browser()); // Open another tab (tab B). - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); chrome::Find(browser()); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); // Select tab A. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); // Close tab B. - browser()->CloseTabContents(browser()->GetWebContentsAt(1)); + chrome::CloseWebContents(browser(), chrome::GetWebContentsAt(browser(), 1)); // Click on the location bar so that Find box loses focus. ASSERT_NO_FATAL_FAILURE(ui_test_utils::ClickOnView(browser(), @@ -137,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) { chrome::Find(browser()); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); - ui_test_utils::FindInPage(browser()->GetActiveTabContents(), + ui_test_utils::FindInPage(chrome::GetActiveTabContents(browser()), ASCIIToUTF16("a"), true, false, NULL); browser()->GetFindBarController()->EndFindSession( FindBarController::kKeepSelectionOnPage, @@ -180,7 +181,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { browser()->GetFindBarController()->find_bar()->GetFindBarTesting(); // Search for 'a'. - ui_test_utils::FindInPage(browser()->GetActiveTabContents(), + ui_test_utils::FindInPage(chrome::GetActiveTabContents(browser()), ASCIIToUTF16("a"), true, false, NULL); EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText()); @@ -188,7 +189,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); + chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); observer.Wait(); // Make sure Find box is open. @@ -197,7 +198,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); // Search for 'b'. - ui_test_utils::FindInPage(browser()->GetActiveTabContents(), + ui_test_utils::FindInPage(chrome::GetActiveTabContents(browser()), ASCIIToUTF16("b"), true, false, NULL); EXPECT_TRUE(ASCIIToUTF16("b") == find_bar->GetFindSelectedText()); @@ -207,13 +208,13 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_FocusRestoreOnTabSwitch) { location_bar_focus_view_id_)); // Select tab A. Find bar should get focus. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); EXPECT_TRUE(ASCIIToUTF16("a") == find_bar->GetFindSelectedText()); // Select tab B. Location bar should get focus. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), location_bar_focus_view_id_)); } @@ -360,7 +361,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, MAYBE_PasteWithoutTextChange) { // Press Ctrl-V to paste the content back, it should start finding even if the // content is not changed. content::Source<WebContents> notification_source( - browser()->GetActiveWebContents()); + chrome::GetActiveWebContents(browser())); ui_test_utils::WindowedNotificationObserverWithDetails <FindNotificationDetails> observer( chrome::NOTIFICATION_FIND_RESULT_AVAILABLE, notification_source); diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index afb6f70..b8a066e 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -17,6 +17,7 @@ #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/ui/views/frame/system_menu_model.h" @@ -532,7 +533,7 @@ void BrowserFrameWin::GetMetroCurrentTabInfo(WPARAM w_param) { current_tab_info->title = base::win::LocalAllocAndCopyString( browser->GetWindowTitleForCurrentTab()); - WebContents* current_tab = browser->GetActiveWebContents(); + WebContents* current_tab = chrome::GetActiveWebContents(browser); DCHECK(current_tab); current_tab_info->url = base::win::LocalAllocAndCopyString( diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 31b46cd..918303d 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -37,6 +37,7 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window_state.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" @@ -214,7 +215,7 @@ void BookmarkExtensionBackground::Paint(gfx::Canvas* canvas, if (host_view_->IsDetached()) { // Draw the background to match the new tab page. int height = 0; - WebContents* contents = browser_->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser_); if (contents && contents->GetView()) height = contents->GetView()->GetContainerSize().height(); NtpBackgroundUtil::PaintBackgroundDetachedMode( @@ -528,11 +529,11 @@ bool BrowserView::ActivateAppModalDialog() const { } WebContents* BrowserView::GetActiveWebContents() const { - return browser_->GetActiveWebContents(); + return chrome::GetActiveWebContents(browser_.get()); } TabContents* BrowserView::GetActiveTabContents() const { - return browser_->GetActiveTabContents(); + return chrome::GetActiveTabContents(browser_.get()); } gfx::ImageSkia BrowserView::GetOTRAvatarIcon() const { @@ -651,7 +652,7 @@ void BrowserView::BookmarkBarStateChanged( bookmark_bar_view_->SetBookmarkBarState( browser_->bookmark_bar_state(), change_type); } - if (MaybeShowBookmarkBar(browser_->GetActiveTabContents())) + if (MaybeShowBookmarkBar(chrome::GetActiveTabContents(browser_.get()))) Layout(); } @@ -830,7 +831,7 @@ void BrowserView::ToolbarSizeChanged(bool is_animating) { is_animating || (call_state == REENTRANT_FORCE_FAST_RESIZE); if (use_fast_resize) contents_container_->SetFastResize(true); - UpdateUIForContents(browser_->GetActiveTabContents()); + UpdateUIForContents(chrome::GetActiveTabContents(browser_.get())); if (use_fast_resize) contents_container_->SetFastResize(false); @@ -1526,7 +1527,7 @@ bool BrowserView::ShouldShowWindowTitle() const { gfx::ImageSkia BrowserView::GetWindowAppIcon() { if (browser_->is_app()) { - TabContents* contents = browser_->GetActiveTabContents(); + TabContents* contents = chrome::GetActiveTabContents(browser_.get()); if (contents && contents->extension_tab_helper()->GetExtensionAppIcon()) return *contents->extension_tab_helper()->GetExtensionAppIcon(); } @@ -2003,7 +2004,7 @@ void BrowserView::LoadingAnimationCallback() { tabstrip_->UpdateLoadingAnimations(); } else if (ShouldShowWindowIcon()) { // ... or in the window icon area for popups and app windows. - WebContents* web_contents = browser_->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser_.get()); // GetActiveWebContents can return NULL for example under Purify when // the animations are running slowly and this function is called on a timer // through LoadingAnimationCallback. diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 7fbcb2d..0dafb08 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -28,6 +28,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" #include "chrome/browser/ui/search/search.h" #include "chrome/browser/ui/search/search_model.h" @@ -1111,7 +1112,7 @@ void LocationBarView::RefreshPageActionViews() { WebContents* contents = GetWebContentsFromDelegate(delegate_); if (!page_action_views_.empty() && contents) { Browser* browser = browser::FindBrowserWithWebContents(contents); - GURL url = browser->GetActiveWebContents()->GetURL(); + GURL url = chrome::GetActiveWebContents(browser)->GetURL(); for (PageActionViews::const_iterator i(page_action_views_.begin()); i != page_action_views_.end(); ++i) { diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc index 44054e3..edc3975 100644 --- a/chrome/browser/ui/views/select_file_dialog_extension.cc +++ b/chrome/browser/ui/views/select_file_dialog_extension.cc @@ -22,6 +22,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #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/extensions/shell_window.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -266,7 +267,7 @@ void SelectFileDialogExtension::SelectFileImpl( BrowserList::GetLastActive()); if (owner_browser) { base_window = owner_browser->window(); - tab = owner_browser->GetActiveTabContents(); + tab = chrome::GetActiveTabContents(owner_browser); profile_ = tab->profile(); } else if (owner_window) { // If an owner_window was supplied but we couldn't find a browser, this diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc index 5b52173..e925728 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_browsertest.cc @@ -8,6 +8,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ssl/ssl_client_auth_requestor_mock.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/views/ssl_client_certificate_selector.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -60,9 +61,9 @@ class SSLClientCertificateSelectorTest : public InProcessBrowserTest { io_loop_finished_event_.Wait(); - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); selector_ = new SSLClientCertificateSelector( - browser()->GetActiveTabContents(), + chrome::GetActiveTabContents(browser()), auth_requestor_->http_network_session_, auth_requestor_->cert_request_info_, base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, @@ -146,21 +147,21 @@ class SSLClientCertificateSelectorMultiTabTest AddTabAtIndex(1, GURL("about:blank"), content::PAGE_TRANSITION_LINK); AddTabAtIndex(2, GURL("about:blank"), content::PAGE_TRANSITION_LINK); - ASSERT_TRUE(NULL != browser()->GetWebContentsAt(0)); - ASSERT_TRUE(NULL != browser()->GetWebContentsAt(1)); - ASSERT_TRUE(NULL != browser()->GetWebContentsAt(2)); - ui_test_utils::WaitForLoadStop(browser()->GetWebContentsAt(1)); - ui_test_utils::WaitForLoadStop(browser()->GetWebContentsAt(2)); + ASSERT_TRUE(NULL != chrome::GetWebContentsAt(browser(), 0)); + ASSERT_TRUE(NULL != chrome::GetWebContentsAt(browser(), 1)); + ASSERT_TRUE(NULL != chrome::GetWebContentsAt(browser(), 2)); + ui_test_utils::WaitForLoadStop(chrome::GetWebContentsAt(browser(), 1)); + ui_test_utils::WaitForLoadStop(chrome::GetWebContentsAt(browser(), 2)); selector_1_ = new SSLClientCertificateSelector( - browser()->GetTabContentsAt(1), + chrome::GetTabContentsAt(browser(), 1), auth_requestor_1_->http_network_session_, auth_requestor_1_->cert_request_info_, base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, auth_requestor_1_)); selector_1_->Init(); selector_2_ = new SSLClientCertificateSelector( - browser()->GetTabContentsAt(2), + chrome::GetTabContentsAt(browser(), 2), auth_requestor_2_->http_network_session_, auth_requestor_2_->cert_request_info_, base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, @@ -229,7 +230,7 @@ class SSLClientCertificateSelectorMultiProfileTest SSLClientCertificateSelectorTest::SetUpOnMainThread(); selector_1_ = new SSLClientCertificateSelector( - browser_1_->GetActiveTabContents(), + chrome::GetActiveTabContents(browser_1_), auth_requestor_1_->http_network_session_, auth_requestor_1_->cert_request_info_, base::Bind(&SSLClientAuthRequestorMock::CertificateSelected, diff --git a/chrome/browser/ui/views/tab_contents/render_view_context_menu_win.cc b/chrome/browser/ui/views/tab_contents/render_view_context_menu_win.cc index 1a9b2f4..9b70ba1 100644 --- a/chrome/browser/ui/views/tab_contents/render_view_context_menu_win.cc +++ b/chrome/browser/ui/views/tab_contents/render_view_context_menu_win.cc @@ -9,6 +9,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/retargeting_details.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "content/public/browser/web_contents.h" @@ -66,7 +67,7 @@ void RenderViewContextMenuWin::ExecuteCommand(int command_id, NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_LINK, false); - WebContents* source_web_contents = browser->GetActiveWebContents(); + WebContents* source_web_contents = chrome::GetActiveWebContents(browser); WebContents* new_contents = source_web_contents->OpenURL(url_params); DCHECK(new_contents); return; diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 3b545d5..56e6889 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -12,6 +12,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/search/search.h" #include "chrome/browser/ui/search/search_delegate.h" #include "chrome/browser/ui/search/search_model.h" @@ -447,7 +448,7 @@ void BrowserTabStripController::ModeChanged(const chrome::search::Mode& mode) { // repainting of tab's background. int active_index = GetActiveIndex(); DCHECK_NE(active_index, -1); - SetTabDataAt(browser_->GetTabContentsAt(active_index), active_index); + SetTabDataAt(chrome::GetTabContentsAt(browser_, active_index), active_index); } //////////////////////////////////////////////////////////////////////////////// @@ -459,7 +460,7 @@ void BrowserTabStripController::OnToolbarBackgroundAnimatorProgressed() { // background. int active_index = GetActiveIndex(); DCHECK_NE(active_index, -1); - SetTabDataAt(browser_->GetTabContentsAt(active_index), active_index); + SetTabDataAt(chrome::GetTabContentsAt(browser_, active_index), active_index); } void BrowserTabStripController::OnToolbarBackgroundAnimatorCanceled( @@ -477,8 +478,8 @@ void BrowserTabStripController::OnToolbarBackgroundAnimatorCanceled( GetActiveIndex(); if (index == -1) return; - SetTabDataAt(tab_contents ? tab_contents : browser_->GetTabContentsAt(index), - index); + SetTabDataAt(tab_contents ? tab_contents : + chrome::GetTabContentsAt(browser_, index), index); } //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 5da5f22..305aa00 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -16,6 +16,7 @@ #include "chrome/browser/ui/browser_command_controller.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_content_setting_bubble_model_delegate.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" @@ -426,7 +427,7 @@ void ToolbarView::OnMenuButtonClicked(views::View* source, // ToolbarView, LocationBarView::Delegate implementation: TabContents* ToolbarView::GetTabContents() const { - return browser_->GetActiveTabContents(); + return chrome::GetActiveTabContents(browser_); } InstantController* ToolbarView::GetInstant() { @@ -929,7 +930,7 @@ void ToolbarView::UpdateAppMenuState() { void ToolbarView::LayoutLocationBarNTP() { // TODO(kuan): this likely needs to cancel animations. - WebContents* contents = browser_->GetActiveWebContents(); + WebContents* contents = chrome::GetActiveWebContents(browser_); #if defined(USE_AURA) // Under aura we can't use WebContentsView::GetContainerBounds since it is // affected by any animations that scale the window (such as during startup). diff --git a/chrome/browser/ui/views/web_dialog_view_browsertest.cc b/chrome/browser/ui/views/web_dialog_view_browsertest.cc index 952c7cb..11e3d42 100644 --- a/chrome/browser/ui/views/web_dialog_view_browsertest.cc +++ b/chrome/browser/ui/views/web_dialog_view_browsertest.cc @@ -10,6 +10,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/views/web_dialog_view.h" #include "chrome/browser/ui/webui/test_web_dialog_delegate.h" #include "chrome/common/url_constants.h" @@ -99,7 +100,7 @@ IN_PROC_BROWSER_TEST_F(WebDialogBrowserTest, MAYBE_SizeWindow) { TestWebDialogView* view = new TestWebDialogView(browser()->profile(), delegate); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents != NULL); views::Widget::CreateWindowWithParent( view, web_contents->GetView()->GetTopLevelNativeWindow()); diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 76233c2..79527db 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -14,6 +14,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h" #include "chrome/common/chrome_notification_types.h" @@ -549,7 +550,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView, void UpdateZoomControls() { bool enable_increment = false; bool enable_decrement = false; - WebContents* selected_tab = menu_->browser_->GetActiveWebContents(); + WebContents* selected_tab = chrome::GetActiveWebContents(menu_->browser_); int zoom = 100; if (selected_tab) zoom = selected_tab->GetZoomPercent(&enable_increment, &enable_decrement); @@ -570,7 +571,7 @@ class WrenchMenu::ZoomView : public WrenchMenuView, int max_w = 0; - WebContents* selected_tab = menu_->browser_->GetActiveWebContents(); + WebContents* selected_tab = chrome::GetActiveWebContents(menu_->browser_); if (selected_tab) { int min_percent = selected_tab->GetMinimumZoomPercent(); int max_percent = selected_tab->GetMaximumZoomPercent(); diff --git a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc index 62c1a8c..8b7c72f 100644 --- a/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc +++ b/chrome/browser/ui/webui/bookmarks_ui_browsertest.cc @@ -6,6 +6,7 @@ #include "base/test/test_timeouts.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/chrome_pages.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -45,7 +46,7 @@ class BookmarksTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(BookmarksTest, ShouldRedirectToExtension) { ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); - AssertIsBookmarksPage(browser()->GetActiveWebContents()); + AssertIsBookmarksPage(chrome::GetActiveWebContents(browser())); } IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandOpensBookmarksTab) { @@ -54,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandOpensBookmarksTab) { // Bring up the bookmarks manager tab. OpenBookmarksManager(); ASSERT_EQ(1, browser()->tab_count()); - AssertIsBookmarksPage(browser()->GetActiveWebContents()); + AssertIsBookmarksPage(chrome::GetActiveWebContents(browser())); } // If this flakes on Mac, use: http://crbug.com/87200 @@ -69,10 +70,10 @@ IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandAgainGoesBackToBookmarksTab) { OpenBookmarksManager(); ASSERT_EQ(2, browser()->tab_count()); - AssertIsBookmarksPage(browser()->GetActiveWebContents()); + AssertIsBookmarksPage(chrome::GetActiveWebContents(browser())); // Switch to first tab and run command again. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); chrome::ShowBookmarkManager(browser()); // Ensure the bookmarks ui tab is active. @@ -93,5 +94,5 @@ IN_PROC_BROWSER_TEST_F(BookmarksTest, TwoCommandsOneTab) { IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) { ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); ASSERT_EQ(1, browser()->tab_count()); - AssertIsBookmarksPage(browser()->GetActiveWebContents()); + AssertIsBookmarksPage(chrome::GetActiveWebContents(browser())); } diff --git a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc index 10e43b9..5306f09 100644 --- a/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc +++ b/chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc @@ -6,6 +6,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/test_web_dialog_delegate.h" @@ -59,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest, BasicTest) { // The delegate deletes itself. WebDialogDelegate* delegate = new test::TestWebDialogDelegate( GURL(chrome::kChromeUIConstrainedHTMLTestURL)); - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(tab_contents); ConstrainedWebDialogDelegate* dialog_delegate = @@ -78,7 +79,7 @@ IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest, // The delegate deletes itself. WebDialogDelegate* delegate = new test::TestWebDialogDelegate( GURL(chrome::kChromeUIConstrainedHTMLTestURL)); - TabContents* tab_contents = browser()->GetActiveTabContents(); + TabContents* tab_contents = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(tab_contents); ConstrainedWebDialogDelegate* dialog_delegate = diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc index 8285f81..b03b31a 100644 --- a/chrome/browser/ui/webui/feedback_ui.cc +++ b/chrome/browser/ui/webui/feedback_ui.cc @@ -22,6 +22,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/singleton_tabs.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" @@ -115,7 +116,7 @@ std::string GetUserEmail() { int GetIndexOfFeedbackTab(Browser* browser) { GURL feedback_url(chrome::kChromeUIFeedbackURL); for (int i = 0; i < browser->tab_count(); ++i) { - WebContents* tab = browser->GetWebContentsAt(i); + WebContents* tab = chrome::GetWebContentsAt(browser, i); if (tab && tab->GetURL().GetWithEmptyPath() == feedback_url) return i; } @@ -145,7 +146,7 @@ void ShowWebFeedbackView(Browser* browser, int feedback_tab_index = GetIndexOfFeedbackTab(browser); if (feedback_tab_index >= 0) { // Do not refresh screenshot, do not create a new tab - browser->ActivateTabAt(feedback_tab_index, true); + chrome::ActivateTabAt(browser, feedback_tab_index, true); return; } @@ -385,7 +386,7 @@ bool FeedbackHandler::Init() { if (!browser || index >= browser->tab_count()) return false; - WebContents* target_tab = browser->GetWebContentsAt(index); + WebContents* target_tab = chrome::GetWebContentsAt(browser, index); if (target_tab) { target_tab_url_ = target_tab->GetURL().spec(); } diff --git a/chrome/browser/ui/webui/inspect_ui_browsertest.cc b/chrome/browser/ui/webui/inspect_ui_browsertest.cc index 23fa013..ccfc045 100644 --- a/chrome/browser/ui/webui/inspect_ui_browsertest.cc +++ b/chrome/browser/ui/webui/inspect_ui_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -41,7 +42,7 @@ IN_PROC_BROWSER_TEST_F(InspectUITest, DISABLED_SharedWorkersList) { NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ASSERT_TRUE(web_contents != NULL); std::string result; diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc index cb5fe02..806d6b6 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui_browsertest.cc @@ -14,6 +14,7 @@ #include "chrome/browser/prerender/prerender_manager_factory.h" #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/webui/web_ui_browsertest.h" #include "chrome/common/chrome_switches.h" @@ -245,7 +246,7 @@ void NetInternalsTest::MessageHandler::PrerenderPage( void NetInternalsTest::MessageHandler::NavigateToPrerender( const ListValue* list_value) { content::RenderViewHost* host = - browser()->GetWebContentsAt(1)->GetRenderViewHost(); + chrome::GetWebContentsAt(browser(), 1)->GetRenderViewHost(); host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16("Click()")); } @@ -262,7 +263,7 @@ void NetInternalsTest::MessageHandler::CreateIncognitoBrowser( void NetInternalsTest::MessageHandler::CloseIncognitoBrowser( const ListValue* list_value) { ASSERT_TRUE(incognito_browser_); - incognito_browser_->CloseAllTabs(); + chrome::CloseAllTabs(incognito_browser_); // Closing all a Browser's tabs will ultimately result in its destruction, // thought it may not have been destroyed yet. incognito_browser_ = NULL; @@ -324,7 +325,7 @@ void NetInternalsTest::SetUpCommandLine(CommandLine* command_line) { void NetInternalsTest::SetUpOnMainThread() { // Increase the memory allowed in a prerendered page above normal settings, // as debug builds use more memory and often go over the usual limit. - Profile* profile = browser()->GetActiveTabContents()->profile(); + Profile* profile = browser()->profile(); prerender::PrerenderManager* prerender_manager = prerender::PrerenderManagerFactory::GetForProfile(profile); prerender_manager->mutable_config().max_bytes = 1000 * 1024 * 1024; diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc index e1b906c..210cad6 100644 --- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc +++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc @@ -29,6 +29,7 @@ #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/extensions/application_launch.h" #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" @@ -571,7 +572,7 @@ void AppLauncherHandler::HandleLaunchApp(const ListValue* args) { web_ui()->GetWebContents()); WebContents* old_contents = NULL; if (browser) - old_contents = browser->GetActiveWebContents(); + old_contents = chrome::GetActiveWebContents(browser); WebContents* new_contents = application_launch::OpenApplication( profile, extension, launch_container, GURL(url), @@ -579,7 +580,7 @@ void AppLauncherHandler::HandleLaunchApp(const ListValue* args) { // This will also destroy the handler, so do not perform any actions after. if (new_contents != old_contents && browser && browser->tab_count() > 1) - browser->CloseTabContents(old_contents); + chrome::CloseWebContents(browser, old_contents); } } diff --git a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc index 134911d..5fb1892 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc @@ -5,6 +5,7 @@ #include "base/command_line.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" @@ -34,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, ChromeInternalLoadsNTP) { ui_test_utils::NavigateToURL(browser(), GURL("chrome-internal:")); bool empty_inner_html = false; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetWebContentsAt(0)->GetRenderViewHost(), L"", + chrome::GetWebContentsAt(browser(), 0)->GetRenderViewHost(), L"", L"window.domAutomationController.send(document.body.innerHTML == '')", &empty_inner_html)); ASSERT_FALSE(empty_inner_html); @@ -53,7 +54,7 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, LoadNTPInExistingProcess) { ui_test_utils::NavigateToURLWithDisposition( browser(), GURL(chrome::kChromeUINewTabURL), NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); - EXPECT_EQ(1, browser()->GetWebContentsAt(1)->GetMaxPageID()); + EXPECT_EQ(1, chrome::GetWebContentsAt(browser(), 1)->GetMaxPageID()); // Navigate that tab to another site. This allows the NTP process to exit, // but it keeps the NTP SiteInstance (and its max_page_id) alive in history. @@ -74,27 +75,27 @@ IN_PROC_BROWSER_TEST_F(NewTabUIBrowserTest, LoadNTPInExistingProcess) { ui_test_utils::NavigateToURLWithDisposition( browser(), GURL(chrome::kChromeUINewTabURL), NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); - EXPECT_EQ(1, browser()->GetWebContentsAt(2)->GetMaxPageID()); + EXPECT_EQ(1, chrome::GetWebContentsAt(browser(), 2)->GetMaxPageID()); chrome::CloseTab(browser()); // Open another Web UI page in a new tab. ui_test_utils::NavigateToURLWithDisposition( browser(), GURL(chrome::kChromeUISettingsURL), NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); - EXPECT_EQ(1, browser()->GetWebContentsAt(2)->GetMaxPageID()); + EXPECT_EQ(1, chrome::GetWebContentsAt(browser(), 2)->GetMaxPageID()); // At this point, opening another NTP will use the existing WebUI process // but its own SiteInstance, so the page IDs shouldn't affect each other. ui_test_utils::NavigateToURLWithDisposition( browser(), GURL(chrome::kChromeUINewTabURL), NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); - EXPECT_EQ(1, browser()->GetWebContentsAt(3)->GetMaxPageID()); + EXPECT_EQ(1, chrome::GetWebContentsAt(browser(), 3)->GetMaxPageID()); // Navigating to the NTP in the original tab causes a BrowsingInstance // swap, so it gets a new SiteInstance starting with page ID 1 again. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL)); - EXPECT_EQ(1, browser()->GetWebContentsAt(1)->GetMaxPageID()); + EXPECT_EQ(1, chrome::GetWebContentsAt(browser(), 1)->GetMaxPageID()); } // Loads chrome://hang/ into two NTP tabs, ensuring we don't crash. diff --git a/chrome/browser/ui/webui/ntp/suggestions_combiner.cc b/chrome/browser/ui/webui/ntp/suggestions_combiner.cc index 49ebfdf..e8d5636 100644 --- a/chrome/browser/ui/webui/ntp/suggestions_combiner.cc +++ b/chrome/browser/ui/webui/ntp/suggestions_combiner.cc @@ -12,6 +12,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/webui/ntp/suggestions_page_handler.h" #include "chrome/browser/ui/webui/ntp/suggestions_source.h" #include "chrome/browser/ui/webui/ntp/suggestions_source_discovery.h" @@ -162,7 +163,7 @@ bool SuggestionsCombiner::IsURLAlreadyOpen(const GURL &url) { continue; for (int i = 0; i < browser->tab_count(); i++) { - const content::WebContents* tab = browser->GetWebContentsAt(i); + const content::WebContents* tab = chrome::GetWebContentsAt(browser, i); if (tab->GetURL() == url) return true; } diff --git a/chrome/browser/ui/webui/options2/options_ui2_browsertest.cc b/chrome/browser/ui/webui/options2/options_ui2_browsertest.cc index 1ba49fd..c912d6f 100644 --- a/chrome/browser/ui/webui/options2/options_ui2_browsertest.cc +++ b/chrome/browser/ui/webui/options2/options_ui2_browsertest.cc @@ -7,6 +7,7 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -27,7 +28,7 @@ void OptionsBrowserTest::NavigateToSettings() { void OptionsBrowserTest::VerifyNavbar() { bool navbar_exist = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"domAutomationController.send(" L"!!document.getElementById('navigation'))", &navbar_exist)); @@ -35,7 +36,7 @@ void OptionsBrowserTest::VerifyNavbar() { } void OptionsBrowserTest::VerifyTitle() { - string16 title = browser()->GetActiveWebContents()->GetTitle(); + string16 title = chrome::GetActiveWebContents(browser())->GetTitle(); string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE); EXPECT_NE(title.find(expected_title), string16::npos); } diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc index 61c8d2b..07938e2 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_handler_unittest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/printing/print_preview_unit_test_base.h" #include "chrome/browser/printing/print_view_manager.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/webui/print_preview/print_preview_handler.h" #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" @@ -58,7 +59,7 @@ class PrintPreviewHandlerTest : public PrintPreviewUnitTestBase { } void OpenPrintPreviewTab() { - TabContents* initiator_tab = browser()->GetActiveTabContents(); + TabContents* initiator_tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(initiator_tab); printing::PrintPreviewTabController* controller = diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc index de26a6f..eb75655 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui_unittest.cc @@ -9,6 +9,7 @@ #include "chrome/browser/printing/print_preview_unit_test_base.h" #include "chrome/browser/printing/print_view_manager.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/constrained_window_tab_helper.h" #include "chrome/browser/ui/tab_contents/tab_contents.h" #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h" @@ -46,7 +47,7 @@ class PrintPreviewUIUnitTest : public PrintPreviewUnitTestBase { // Create/Get a preview tab for initiator tab. TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) { - TabContents* initiator_tab = browser()->GetActiveTabContents(); + TabContents* initiator_tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(initiator_tab); EXPECT_EQ(0U, GetConstrainedWindowCount(initiator_tab)); @@ -100,7 +101,7 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewData) { // Set and get the individual draft pages. TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) { - TabContents* initiator_tab = browser()->GetActiveTabContents(); + TabContents* initiator_tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(initiator_tab); printing::PrintPreviewTabController* controller = @@ -160,7 +161,7 @@ TEST_F(PrintPreviewUIUnitTest, PrintPreviewDraftPages) { // Test the browser-side print preview cancellation functionality. TEST_F(PrintPreviewUIUnitTest, GetCurrentPrintPreviewStatus) { - TabContents* initiator_tab = browser()->GetActiveTabContents(); + TabContents* initiator_tab = chrome::GetActiveTabContents(browser()); ASSERT_TRUE(initiator_tab); printing::PrintPreviewTabController* controller = @@ -218,10 +219,8 @@ TEST_F(PrintPreviewUIUnitTest, InitiatorTabGetsFocusOnPrintPreviewTabClose) { WebContentsTester::CreateTestWebContentsCountFocus(profile(), NULL); WebContentsTester* initiator_tester = WebContentsTester::For(initiator_contents); - browser()->AddWebContents(initiator_contents, - NEW_FOREGROUND_TAB, - gfx::Rect(), - false); + chrome::AddWebContents(browser(), NULL, initiator_contents, + NEW_FOREGROUND_TAB, gfx::Rect(), false); TabContents* initiator_tab = TabContents::FromWebContents(initiator_contents); ASSERT_TRUE(initiator_tab); EXPECT_EQ(2, browser()->tab_count()); diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc index e9dfda9..7cc2af3 100644 --- a/chrome/browser/ui/webui/web_ui_browsertest.cc +++ b/chrome/browser/ui/webui/web_ui_browsertest.cc @@ -19,6 +19,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/webui/chrome_url_data_manager.h" #include "chrome/browser/ui/webui/test_chrome_web_ui_controller_factory.h" #include "chrome/browser/ui/webui/web_ui_test_handler.h" @@ -197,7 +198,7 @@ void WebUIBrowserTest::PreLoadJavascriptLibraries( void WebUIBrowserTest::BrowsePreload(const GURL& browse_to) { content::TestNavigationObserver navigation_observer( content::Source<NavigationController>( - &browser()->GetActiveWebContents()->GetController()), + &chrome::GetActiveWebContents(browser())->GetController()), this, 1); browser::NavigateParams params( browser(), GURL(browse_to), content::PAGE_TRANSITION_TYPED); @@ -224,7 +225,7 @@ void WebUIBrowserTest::BrowsePrintPreload(const GURL& browse_to) { printing::PrintPreviewTabController::GetInstance(); ASSERT_TRUE(tab_controller); TabContents* preview_tab = tab_controller->GetPrintPreviewForTab( - browser()->GetActiveTabContents()); + chrome::GetActiveTabContents(browser())); ASSERT_TRUE(preview_tab); SetWebUIInstance(preview_tab->web_contents()->GetWebUI()); } @@ -465,7 +466,7 @@ bool WebUIBrowserTest::RunJavascriptUsingHandler( void WebUIBrowserTest::SetupHandlers() { content::WebUI* web_ui_instance = override_selected_web_ui_ ? override_selected_web_ui_ : - browser()->GetActiveWebContents()->GetWebUI(); + chrome::GetActiveWebContents(browser())->GetWebUI(); ASSERT_TRUE(web_ui_instance != NULL); test_handler_->set_web_ui(web_ui_instance); diff --git a/chrome/browser/unload_browsertest.cc b/chrome/browser/unload_browsertest.cc index 2706371..1b7e67d 100644 --- a/chrome/browser/unload_browsertest.cc +++ b/chrome/browser/unload_browsertest.cc @@ -16,6 +16,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" @@ -128,7 +129,7 @@ class UnloadTest : public InProcessBrowserTest { void CheckTitle(const char* expected_title) { string16 expected = ASCIIToUTF16(expected_title); - EXPECT_EQ(expected, browser()->GetActiveWebContents()->GetTitle()); + EXPECT_EQ(expected, chrome::GetActiveWebContents(browser())->GetTitle()); } void NavigateToDataURL(const std::string& html_content, @@ -275,7 +276,7 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseBeforeUnloadCancel) { // the renderer. string16 expected_title = ASCIIToUTF16("cancelled"); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); ClickModalDialogButton(false); ASSERT_EQ(expected_title, title_watcher.WaitAndGetTitle()); @@ -390,7 +391,7 @@ IN_PROC_BROWSER_TEST_F(UnloadTest, BrowserCloseTabWhenOtherTabHasListener) { ui_test_utils::WindowedNotificationObserver load_stop_observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents()); + ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser())); observer.Wait(); load_stop_observer.Wait(); CheckTitle("popup"); diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 2f0a408..b28b948 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2404,6 +2404,10 @@ 'browser/ui/browser_ui_prefs.h', 'browser/ui/browser_tab_restore_service_delegate.cc', 'browser/ui/browser_tab_restore_service_delegate.h', + 'browser/ui/browser_tabrestore.cc', + 'browser/ui/browser_tabrestore.h', + 'browser/ui/browser_tabstrip.cc', + 'browser/ui/browser_tabstrip.h', 'browser/ui/browser_toolbar_model_delegate.cc', 'browser/ui/browser_toolbar_model_delegate.h', 'browser/ui/browser_view_prefs.cc', diff --git a/chrome/test/base/browser_with_test_window_test.cc b/chrome/test/base/browser_with_test_window_test.cc index fcd2c7e..211feab 100644 --- a/chrome/test/base/browser_with_test_window_test.cc +++ b/chrome/test/base/browser_with_test_window_test.cc @@ -7,6 +7,7 @@ #include "base/synchronization/waitable_event.h" #include "chrome/browser/profiles/profile_destroyer.h" #include "chrome/browser/ui/browser_navigator.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/render_messages.h" @@ -137,14 +138,15 @@ void BrowserWithTestWindowTest::NavigateAndCommit( } void BrowserWithTestWindowTest::NavigateAndCommitActiveTab(const GURL& url) { - NavigateAndCommit(&browser()->GetActiveWebContents()->GetController(), url); + NavigateAndCommit(&chrome::GetActiveWebContents(browser())->GetController(), + url); } void BrowserWithTestWindowTest::DestroyBrowserAndProfile() { if (browser_.get()) { // Make sure we close all tabs, otherwise Browser isn't happy in its // destructor. - browser()->CloseAllTabs(); + chrome::CloseAllTabs(browser()); browser_.reset(NULL); } window_.reset(NULL); diff --git a/chrome/test/base/browser_with_test_window_test.h b/chrome/test/base/browser_with_test_window_test.h index e286ded..f37c3cc 100644 --- a/chrome/test/base/browser_with_test_window_test.h +++ b/chrome/test/base/browser_with_test_window_test.h @@ -41,7 +41,7 @@ class WebContents; // // Add a new tab and navigate it. This will be at index 0. // AddTab(browser(), GURL("http://foo/1")); // NavigationController* controller = -// &browser()->GetTabContentsAt(0)->GetController(); +// &chrome::GetTabContentsAt(browser(), 0)->GetController(); // // // Navigate somewhere else. // GURL url2("http://foo/2"); diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index 30a2eca..711c878 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -22,6 +22,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_constants.h" @@ -285,8 +286,8 @@ void InProcessBrowserTest::AddBlankTabAndShow(Browser* browser) { ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, content::NotificationService::AllSources()); - browser->AddSelectedTabWithURL( - GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_START_PAGE); + chrome::AddSelectedTabWithURL(browser, GURL(chrome::kAboutBlankURL), + content::PAGE_TRANSITION_START_PAGE); observer.Wait(); browser->window()->Show(); @@ -349,7 +350,7 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() { if (!BrowserList::empty()) { browser_ = *BrowserList::begin(); - ui_test_utils::WaitForLoadStop(browser_->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser_)); } // Pump any pending events that were created as a result of creating a diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 7b4af42..314da98c 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -40,6 +40,7 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" #include "chrome/browser/ui/find_bar/find_tab_helper.h" @@ -346,7 +347,7 @@ void RunAllPendingInMessageLoop(content::BrowserThread::ID thread_id) { } bool GetCurrentTabTitle(const Browser* browser, string16* title) { - WebContents* web_contents = browser->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser); if (!web_contents) return false; NavigationEntry* last_entry = web_contents->GetController().GetActiveEntry(); @@ -400,7 +401,8 @@ void OpenURLOffTheRecord(Profile* profile, const GURL& url) { chrome::OpenURLOffTheRecord(profile, url); Browser* browser = browser::FindTabbedBrowser( profile->GetOffTheRecordProfile(), false); - WaitForNavigations(&browser->GetActiveWebContents()->GetController(), 1); + WaitForNavigations(&chrome::GetActiveWebContents(browser)->GetController(), + 1); } void NavigateToURL(browser::NavigateParams* params) { @@ -428,11 +430,11 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete( int number_of_navigations, WindowOpenDisposition disposition, int browser_test_flags) { - if (disposition == CURRENT_TAB && browser->GetActiveWebContents()) - WaitForLoadStop(browser->GetActiveWebContents()); + if (disposition == CURRENT_TAB && chrome::GetActiveWebContents(browser)) + WaitForLoadStop(chrome::GetActiveWebContents(browser)); NavigationController* controller = - browser->GetActiveWebContents() ? - &browser->GetActiveWebContents()->GetController() : NULL; + chrome::GetActiveWebContents(browser) ? + &chrome::GetActiveWebContents(browser)->GetController() : NULL; content::TestNavigationObserver same_tab_observer( content::Source<NavigationController>(controller), NULL, @@ -468,7 +470,8 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete( WebContents* web_contents = NULL; if (disposition == NEW_BACKGROUND_TAB) { // We've opened up a new tab, but not selected it. - web_contents = browser->GetWebContentsAt(browser->active_index() + 1); + web_contents = + chrome::GetWebContentsAt(browser, browser->active_index() + 1); EXPECT_TRUE(web_contents != NULL) << " Unable to wait for navigation to \"" << url.spec() << "\" because the new tab is not available yet"; @@ -477,7 +480,7 @@ static void NavigateToURLWithDispositionBlockUntilNavigationsComplete( (disposition == NEW_FOREGROUND_TAB) || (disposition == SINGLETON_TAB)) { // The currently selected tab is the right one. - web_contents = browser->GetActiveWebContents(); + web_contents = chrome::GetActiveWebContents(browser); } if (disposition == CURRENT_TAB) { base::RunLoop run_loop; @@ -521,7 +524,7 @@ void NavigateToURLBlockUntilNavigationsComplete(Browser* browser, DOMElementProxyRef GetActiveDOMDocument(Browser* browser) { JavaScriptExecutionController* executor = new InProcessJavaScriptExecutionController( - browser->GetActiveWebContents()->GetRenderViewHost()); + chrome::GetActiveWebContents(browser)->GetRenderViewHost()); int element_handle; executor->ExecuteJavaScriptAndGetReturn("document;", &element_handle); return executor->GetObjectProxy<DOMElementProxy>(element_handle); diff --git a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h index c801255..2e6cd6b 100644 --- a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h +++ b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h @@ -4,6 +4,7 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/webui/certificate_viewer_webui.h" #include "chrome/browser/ui/webui/web_ui_browsertest.h" @@ -38,7 +39,7 @@ void CertificateViewerUITest::ShowCertificateViewer() { CertificateViewerDialog* dialog = new CertificateViewerDialog( google_cert); dialog->AddObserver(&dialog_observer); - dialog->Show(browser()->GetActiveWebContents(), + dialog->Show(chrome::GetActiveWebContents(browser()), browser()->window()->GetNativeWindow()); dialog->RemoveObserver(&dialog_observer); content::WebUI* webui = dialog_observer.GetWebUI(); diff --git a/chrome/test/gpu/gpu_pixel_browsertest.cc b/chrome/test/gpu/gpu_pixel_browsertest.cc index dd86a3d..a0b92f7 100644 --- a/chrome/test/gpu/gpu_pixel_browsertest.cc +++ b/chrome/test/gpu/gpu_pixel_browsertest.cc @@ -9,6 +9,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/window_snapshot/window_snapshot.h" #include "chrome/common/chrome_paths.h" @@ -166,7 +167,7 @@ class GpuPixelBrowserTest : public InProcessBrowserTest { js_call << ");"; ASSERT_TRUE(ui_test_utils::ExecuteJavaScript( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", js_call.str())); std::string message; @@ -373,7 +374,7 @@ class GpuPixelBrowserTest : public InProcessBrowserTest { // have if the tab contents have the desired size. gfx::Rect GetNewTabContainerBounds(const gfx::Size& desired_size) { gfx::Rect container_rect; - browser()->GetActiveWebContents()->GetContainerBounds(&container_rect); + chrome::GetActiveWebContents(browser())->GetContainerBounds(&container_rect); // Size cannot be negative, so use a point. gfx::Point correction( desired_size.width() - container_rect.size().width(), @@ -393,7 +394,7 @@ class GpuPixelBrowserTest : public InProcessBrowserTest { gfx::Rect root_bounds = browser()->window()->GetBounds(); gfx::Rect tab_contents_bounds; - browser()->GetActiveWebContents()->GetContainerBounds( + chrome::GetActiveWebContents(browser())->GetContainerBounds( &tab_contents_bounds); gfx::Rect snapshot_bounds(tab_contents_bounds.x() - root_bounds.x(), diff --git a/chrome/test/perf/rendering/latency_tests.cc b/chrome/test/perf/rendering/latency_tests.cc index 3fe99fe..dfae933 100644 --- a/chrome/test/perf/rendering/latency_tests.cc +++ b/chrome/test/perf/rendering/latency_tests.cc @@ -14,6 +14,7 @@ #include "base/timer.h" #include "base/version.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_paths.h" #include "chrome/common/chrome_switches.h" @@ -601,7 +602,7 @@ void LatencyTest::GetMeanFrameTimeMicros(int* frame_time) const { void LatencyTest::SendInput() { content::RenderViewHost* rvh = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); WebKit::WebMouseEvent mouse_event; mouse_event.movementX = 1; mouse_x_ += mouse_event.movementX; diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index e3592b9..c488999a 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -15,6 +15,7 @@ #include "base/values.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/ui/browser.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/window_snapshot/window_snapshot.h" @@ -210,7 +211,7 @@ class ThroughputTest : public BrowserPerfTest { gfx::Rect root_bounds = browser()->window()->GetBounds(); gfx::Rect tab_contents_bounds; - browser()->GetActiveWebContents()->GetContainerBounds( + chrome::GetActiveWebContents(browser())->GetContainerBounds( &tab_contents_bounds); gfx::Rect snapshot_bounds(tab_contents_bounds.x() - root_bounds.x(), @@ -316,7 +317,7 @@ class ThroughputTest : public BrowserPerfTest { LOG(INFO) << gurl_.possibly_invalid_spec(); ui_test_utils::NavigateToURLWithDisposition( browser(), gurl_, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE); - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); // Let the test spin up. LOG(INFO) << "Spinning up test..."; @@ -377,7 +378,7 @@ class ThroughputTest : public BrowserPerfTest { // Close the tab so that we can quit without timing out during the // wait-for-idle stage in browser_test framework. - browser()->GetActiveWebContents()->Close(); + chrome::GetActiveWebContents(browser())->Close(); } private: diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index 677a27c..ed1bdcf 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -15,6 +15,7 @@ #include "build/build_config.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/in_process_browser_test.h" @@ -245,7 +246,7 @@ void PPAPITestBase::RunTestURL(const GURL& test_url) { // any other value indicates completion (in this case it will start with // "PASS" or "FAIL"). This keeps us from timing out on waits for long tests. TestFinishObserver observer( - browser()->GetActiveWebContents()->GetRenderViewHost(), kTimeoutMs); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), kTimeoutMs); ui_test_utils::NavigateToURL(browser(), test_url); @@ -1088,7 +1089,7 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_CreateInvisible) { IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { // The plugin will be loaded in the foreground tab and will send us a message. TestFinishObserver observer( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), TestTimeouts::action_max_timeout_ms()); GURL url = GetTestFileUrl("View_PageHideShow"); @@ -1113,7 +1114,7 @@ IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { observer.Reset(); // Switch back to the test tab. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out."; EXPECT_STREQ("PASS", observer.result().c_str()); @@ -1128,7 +1129,7 @@ IN_PROC_BROWSER_TEST_F(PPAPITest, InputEvent_AcceptTouchEvent) { }; for (size_t i = 0; i < arraysize(positive_tests); ++i) { - RenderViewHost* host = browser()->GetActiveWebContents()-> + RenderViewHost* host = chrome::GetActiveWebContents(browser())-> GetRenderViewHost(); RunTest(positive_tests[i]); EXPECT_TRUE(content::RenderViewHostTester::HasTouchEventHandler(host)); @@ -1136,7 +1137,7 @@ IN_PROC_BROWSER_TEST_F(PPAPITest, InputEvent_AcceptTouchEvent) { std::string negative_tests[] = { "InputEvent_AcceptTouchEvent_2" }; for (size_t i = 0; i < arraysize(negative_tests); ++i) { - RenderViewHost* host = browser()->GetActiveWebContents()-> + RenderViewHost* host = chrome::GetActiveWebContents(browser())-> GetRenderViewHost(); RunTest(negative_tests[i]); EXPECT_FALSE(content::RenderViewHostTester::HasTouchEventHandler(host)); diff --git a/content/browser/DEPS b/content/browser/DEPS index fb286eb..495e626e3 100644 --- a/content/browser/DEPS +++ b/content/browser/DEPS @@ -18,5 +18,6 @@ include_rules = [ # ONLY USED BY TESTS "+chrome/browser/ui/browser.h", "+chrome/browser/ui/browser_commands.h", + "+chrome/browser/ui/browser_tabstrip.h", "+chrome/browser/ui/singleton_tabs.h", ] diff --git a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc index a1f8776..d361509 100644 --- a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc +++ b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc @@ -7,6 +7,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host_impl.h" @@ -41,7 +42,7 @@ class CrossPlatformAccessibilityBrowserTest : public InProcessBrowserTest { content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED, content::NotificationService::AllSources()); content::RenderWidgetHostView* host_view = - browser()->GetActiveWebContents()->GetRenderWidgetHostView(); + chrome::GetActiveWebContents(browser())->GetRenderWidgetHostView(); RenderWidgetHostImpl* host = RenderWidgetHostImpl::From(host_view->GetRenderWidgetHost()); RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(host); diff --git a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc index 9418dee..cca0008 100644 --- a/content/browser/accessibility/dump_accessibility_tree_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_tree_browsertest.cc @@ -11,6 +11,7 @@ #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/accessibility/browser_accessibility.h" @@ -84,7 +85,7 @@ class DumpAccessibilityTreeTest : public InProcessBrowserTest { IN_PROC_BROWSER_TEST_F(DumpAccessibilityTreeTest, PlatformTreeDifferenceTest) { RenderWidgetHostViewPort* host_view = static_cast<RenderWidgetHostViewPort*>( - browser()->GetActiveWebContents()->GetRenderWidgetHostView()); + chrome::GetActiveWebContents(browser())->GetRenderWidgetHostView()); RenderWidgetHost* host = host_view->GetRenderWidgetHost(); RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(RenderWidgetHostImpl::From(host)); diff --git a/content/browser/accessibility/renderer_accessibility_browsertest.cc b/content/browser/accessibility/renderer_accessibility_browsertest.cc index 698098d..65990e3 100644 --- a/content/browser/accessibility/renderer_accessibility_browsertest.cc +++ b/content/browser/accessibility/renderer_accessibility_browsertest.cc @@ -7,6 +7,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host_impl.h" @@ -42,7 +43,7 @@ class RendererAccessibilityBrowserTest : public InProcessBrowserTest { content::NOTIFICATION_RENDER_VIEW_HOST_ACCESSIBILITY_TREE_UPDATED, content::NotificationService::AllSources()); content::RenderWidgetHostView* host_view = - browser()->GetActiveWebContents()->GetRenderWidgetHostView(); + chrome::GetActiveWebContents(browser())->GetRenderWidgetHostView(); RenderWidgetHostImpl* host = RenderWidgetHostImpl::From(host_view->GetRenderWidgetHost()); RenderViewHostImpl* view_host = static_cast<RenderViewHostImpl*>(host); diff --git a/content/browser/child_process_security_policy_browsertest.cc b/content/browser/child_process_security_policy_browsertest.cc index a6437dd..3065133 100644 --- a/content/browser/child_process_security_policy_browsertest.cc +++ b/content/browser/child_process_security_policy_browsertest.cc @@ -8,6 +8,7 @@ #include "base/file_path.h" #include "base/process_util.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/child_process_security_policy_impl.h" @@ -46,7 +47,7 @@ IN_PROC_BROWSER_TEST_F(ChildProcessSecurityPolicyInProcessBrowserTest, NoLeak) { ChildProcessSecurityPolicyImpl::GetInstance()->security_state_.size(), 1U); - WebContents* web_contents = browser()->GetWebContentsAt(0); + WebContents* web_contents = chrome::GetWebContentsAt(browser(), 0); ASSERT_TRUE(web_contents != NULL); base::KillProcess(web_contents->GetRenderProcessHost()->GetHandle(), content::RESULT_CODE_KILLED, true); diff --git a/content/browser/device_orientation/device_orientation_browsertest.cc b/content/browser/device_orientation/device_orientation_browsertest.cc index 6eabd93..9459ef9 100644 --- a/content/browser/device_orientation/device_orientation_browsertest.cc +++ b/content/browser/device_orientation/device_orientation_browsertest.cc @@ -6,6 +6,7 @@ #include "base/file_path.h" #include "base/memory/ref_counted.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/device_orientation/orientation.h" @@ -67,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(DeviceOrientationBrowserTest, BasicTest) { // Check that the page got the event it expected and that the provider // saw requests for adding and removing an observer. - EXPECT_EQ("pass", browser()->GetActiveWebContents()->GetURL().ref()); + EXPECT_EQ("pass", chrome::GetActiveWebContents(browser())->GetURL().ref()); EXPECT_TRUE(provider->added_observer_); EXPECT_TRUE(provider->removed_observer_); } diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc index f75c6ad..68ce122 100644 --- a/content/browser/dom_storage/dom_storage_browsertest.cc +++ b/content/browser/dom_storage/dom_storage_browsertest.cc @@ -4,6 +4,7 @@ #include "base/path_service.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/web_contents/web_contents_impl.h" @@ -33,11 +34,12 @@ class DomStorageBrowserTest : public InProcessBrowserTest { Browser* the_browser = incognito ? CreateIncognitoBrowser() : browser(); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( the_browser, test_url, 2); - std::string result = the_browser->GetActiveWebContents()->GetURL().ref(); + std::string result = + chrome::GetActiveWebContents(the_browser)->GetURL().ref(); if (result != "pass") { std::string js_result; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - the_browser->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(the_browser)->GetRenderViewHost(), L"", L"window.domAutomationController.send(getLog())", &js_result)); FAIL() << "Failed: " << js_result; } diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc index 14baaa6..4e9cb41 100644 --- a/content/browser/download/mhtml_generation_browsertest.cc +++ b/content/browser/download/mhtml_generation_browsertest.cc @@ -6,6 +6,7 @@ #include "base/file_path.h" #include "base/scoped_temp_dir.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/ui_test_utils.h" @@ -56,7 +57,7 @@ IN_PROC_BROWSER_TEST_F(MHTMLGenerationTest, GenerateMHTML) { ui_test_utils::NavigateToURL(browser(), test_server()->GetURL("files/google/google.html")); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); web_contents->GenerateMHTML(path, base::Bind(&MHTMLGenerationTest::MHTMLGenerated, this)); diff --git a/content/browser/download/save_package_browsertest.cc b/content/browser/download/save_package_browsertest.cc index 8f40fcc..bfe0a82 100644 --- a/content/browser/download/save_package_browsertest.cc +++ b/content/browser/download/save_package_browsertest.cc @@ -4,6 +4,7 @@ #include "base/scoped_temp_dir.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/download/save_package.h" @@ -40,7 +41,7 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ImplicitCancel) { FilePath full_file_name, dir; GetDestinationPaths("a", &full_file_name, &dir); scoped_refptr<SavePackage> save_package(new SavePackage( - browser()->GetActiveWebContents(), + chrome::GetActiveWebContents(browser()), content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir)); ASSERT_TRUE(test_server()->Stop()); } @@ -54,7 +55,7 @@ IN_PROC_BROWSER_TEST_F(SavePackageBrowserTest, ExplicitCancel) { FilePath full_file_name, dir; GetDestinationPaths("a", &full_file_name, &dir); scoped_refptr<SavePackage> save_package(new SavePackage( - browser()->GetActiveWebContents(), + chrome::GetActiveWebContents(browser()), content::SAVE_PAGE_TYPE_AS_ONLY_HTML, full_file_name, dir)); save_package->Cancel(true); ASSERT_TRUE(test_server()->Stop()); diff --git a/content/browser/fileapi/file_system_browsertest.cc b/content/browser/fileapi/file_system_browsertest.cc index 5519e5d..acdf1b3 100644 --- a/content/browser/fileapi/file_system_browsertest.cc +++ b/content/browser/fileapi/file_system_browsertest.cc @@ -8,6 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/test/thread_test_helper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" @@ -40,11 +41,12 @@ class FileSystemBrowserTest : public InProcessBrowserTest { ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( the_browser, test_url, 2); LOG(INFO) << "Navigation done."; - std::string result = the_browser->GetActiveWebContents()->GetURL().ref(); + std::string result = + chrome::GetActiveWebContents(the_browser)->GetURL().ref(); if (result != "pass") { std::string js_result; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - the_browser->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(the_browser)->GetRenderViewHost(), L"", L"window.domAutomationController.send(getLog())", &js_result)); FAIL() << "Failed: " << js_result; } diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc index 27d67df..cccdac3 100644 --- a/content/browser/in_process_webkit/indexed_db_browsertest.cc +++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc @@ -12,6 +12,7 @@ #include "base/test/thread_test_helper.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" @@ -54,11 +55,12 @@ class IndexedDBBrowserTest : public InProcessBrowserTest { ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( the_browser, test_url, 2); LOG(INFO) << "Navigation done."; - std::string result = the_browser->GetActiveWebContents()->GetURL().ref(); + std::string result = + chrome::GetActiveWebContents(the_browser)->GetURL().ref(); if (result != "pass") { std::string js_result; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractString( - the_browser->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(the_browser)->GetRenderViewHost(), L"", L"window.domAutomationController.send(getLog())", &js_result)); FAIL() << "Failed: " << js_result; } @@ -115,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DISABLED_ValueSizeTest) { IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DoesntHangTest) { SimpleTest(GetTestURL(FilePath( FILE_PATH_LITERAL("transaction_run_forever.html")))); - ui_test_utils::CrashTab(browser()->GetActiveWebContents()); + ui_test_utils::CrashTab(chrome::GetActiveWebContents(browser())); SimpleTest(GetTestURL(FilePath(FILE_PATH_LITERAL("transaction_test.html")))); } diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc index a717c56..d90f450 100644 --- a/content/browser/media_browsertest.cc +++ b/content/browser/media_browsertest.cc @@ -8,6 +8,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/ui_test_utils.h" #include "content/test/layout_browsertest.h" #include "googleurl/src/gurl.h" @@ -30,7 +31,7 @@ class MediaTest : public InProcessBrowserTest { const string16 kFailed = ASCIIToUTF16("FAILED"); const string16 kError = ASCIIToUTF16("ERROR"); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), kPlaying); + chrome::GetActiveWebContents(browser()), kPlaying); title_watcher.AlsoWaitForTitle(kFailed); title_watcher.AlsoWaitForTitle(kError); diff --git a/content/browser/mouseleave_browsertest.cc b/content/browser/mouseleave_browsertest.cc index bd73f5d..367665e 100644 --- a/content/browser/mouseleave_browsertest.cc +++ b/content/browser/mouseleave_browsertest.cc @@ -5,6 +5,7 @@ #include "base/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/web_contents.h" @@ -34,7 +35,7 @@ IN_PROC_BROWSER_TEST_F(MouseLeaveTest, MAYBE_TestOnMouseOut) { GURL test_url = ui_test_utils::GetTestUrl( FilePath(), FilePath(FILE_PATH_LITERAL("mouseleave.html"))); - content::WebContents* tab = browser()->GetActiveWebContents(); + content::WebContents* tab = chrome::GetActiveWebContents(browser()); gfx::Rect tab_view_bounds; tab->GetView()->GetContainerBounds(&tab_view_bounds); diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc index ca5287a..4cd42bf 100644 --- a/content/browser/plugin_browsertest.cc +++ b/content/browser/plugin_browsertest.cc @@ -6,6 +6,7 @@ #include "base/path_service.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" @@ -84,7 +85,7 @@ class PluginTest : public InProcessBrowserTest { void LoadAndWait(const GURL& url) { string16 expected_title(ASCIIToUTF16("OK")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); title_watcher.AlsoWaitForTitle(ASCIIToUTF16("plugin_not_found")); ui_test_utils::NavigateToURL(browser(), url); @@ -175,9 +176,9 @@ IN_PROC_BROWSER_TEST_F(PluginTest, string16 expected_title(ASCIIToUTF16("OK")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); - ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents()); + ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser())); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); } #endif @@ -202,7 +203,7 @@ IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvokeAlert) { string16 expected_title(ASCIIToUTF16("OK")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); ui_test_utils::WaitForAppModalDialogAndCloseIt(); @@ -400,12 +401,12 @@ IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_PluginConvertPointTest) { string16 expected_title(ASCIIToUTF16("OK")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL")); // TODO(stuartmorgan): When the automation system supports sending clicks, // change the test to trigger on mouse-down rather than window focus. static_cast<content::WebContentsDelegate*>(browser())-> - ActivateContents(browser()->GetActiveWebContents()); + ActivateContents(chrome::GetActiveWebContents(browser())); EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); } #endif diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc index 1c51bffb..5ba07b8 100644 --- a/content/browser/renderer_host/render_process_host_browsertest.cc +++ b/content/browser/renderer_host/render_process_host_browsertest.cc @@ -8,6 +8,7 @@ #include "base/process.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/singleton_tabs.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" @@ -46,7 +47,7 @@ class RenderProcessHostTest : public InProcessBrowserTest { // handle. base::ProcessHandle ShowSingletonTab(const GURL& page) { chrome::ShowSingletonTab(browser(), page); - WebContents* wc = browser()->GetActiveWebContents(); + WebContents* wc = chrome::GetActiveWebContents(browser()); CHECK(wc->GetURL() == page); // Ensure that the backgrounding / foregrounding gets a chance to run. @@ -75,7 +76,7 @@ class RenderProcessHostTest : public InProcessBrowserTest { GURL newtab(chrome::kTestNewTabURL); ui_test_utils::NavigateToURL(browser(), newtab); EXPECT_EQ(tab_count, browser()->tab_count()); - tab1 = browser()->GetWebContentsAt(tab_count - 1); + tab1 = chrome::GetWebContentsAt(browser(), tab_count - 1); rph1 = tab1->GetRenderProcessHost(); EXPECT_EQ(tab1->GetURL(), newtab); EXPECT_EQ(host_count, RenderProcessHostCount()); @@ -88,7 +89,7 @@ class RenderProcessHostTest : public InProcessBrowserTest { tab_count++; host_count++; EXPECT_EQ(tab_count, browser()->tab_count()); - tab1 = browser()->GetWebContentsAt(tab_count - 1); + tab1 = chrome::GetWebContentsAt(browser(), tab_count - 1); rph2 = tab1->GetRenderProcessHost(); EXPECT_EQ(tab1->GetURL(), page1); EXPECT_EQ(host_count, RenderProcessHostCount()); @@ -101,7 +102,7 @@ class RenderProcessHostTest : public InProcessBrowserTest { ui_test_utils::WaitForNewTab(browser()); tab_count++; EXPECT_EQ(tab_count, browser()->tab_count()); - tab2 = browser()->GetWebContentsAt(tab_count - 1); + tab2 = chrome::GetWebContentsAt(browser(), tab_count - 1); EXPECT_EQ(tab2->GetURL(), page2); EXPECT_EQ(host_count, RenderProcessHostCount()); EXPECT_EQ(tab2->GetRenderProcessHost(), rph2); @@ -116,7 +117,7 @@ class RenderProcessHostTest : public InProcessBrowserTest { ui_test_utils::WaitForNewTab(browser()); tab_count++; EXPECT_EQ(tab_count, browser()->tab_count()); - tab2 = browser()->GetWebContentsAt(tab_count - 1); + tab2 = chrome::GetWebContentsAt(browser(), tab_count - 1); EXPECT_EQ(tab2->GetURL(), history); EXPECT_EQ(host_count, RenderProcessHostCount()); EXPECT_EQ(tab2->GetRenderProcessHost(), rph1); @@ -130,7 +131,7 @@ class RenderProcessHostTest : public InProcessBrowserTest { tab_count++; host_count++; EXPECT_EQ(tab_count, browser()->tab_count()); - tab1 = browser()->GetWebContentsAt(tab_count - 1); + tab1 = chrome::GetWebContentsAt(browser(), tab_count - 1); rph3 = tab1->GetRenderProcessHost(); EXPECT_EQ(tab1->GetURL(), bookmarks); EXPECT_EQ(host_count, RenderProcessHostCount()); diff --git a/content/browser/renderer_host/render_view_host_browsertest.cc b/content/browser/renderer_host/render_view_host_browsertest.cc index 714bd7b..2b54a10 100644 --- a/content/browser/renderer_host/render_view_host_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_browsertest.cc @@ -6,6 +6,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host_impl.h" @@ -33,7 +34,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, ui_test_utils::NavigateToURL(browser(), empty_url); RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( - browser()->GetActiveWebContents()->GetRenderViewHost()); + chrome::GetActiveWebContents(browser())->GetRenderViewHost()); { scoped_ptr<Value> value( @@ -206,7 +207,7 @@ class RenderViewHostTestWebContentsObserver IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) { ASSERT_TRUE(test_server()->Start()); RenderViewHostTestWebContentsObserver observer( - browser()->GetActiveWebContents()); + chrome::GetActiveWebContents(browser())); GURL test_url = test_server()->GetURL("files/simple.html"); ui_test_utils::NavigateToURL(browser(), test_url); @@ -219,7 +220,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostTest, FrameNavigateSocketAddress) { IN_PROC_BROWSER_TEST_F(RenderViewHostTest, BaseURLParam) { ASSERT_TRUE(test_server()->Start()); RenderViewHostTestWebContentsObserver observer( - browser()->GetActiveWebContents()); + chrome::GetActiveWebContents(browser())); // Base URL is not set if it is the same as the URL. GURL test_url = test_server()->GetURL("files/simple.html"); diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc index dcbf6dd..b8b8a20 100644 --- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc @@ -8,6 +8,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host_impl.h" @@ -66,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) { // Get the original SiteInstance for later comparison. scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Open a same-site link in a new tab. @@ -74,7 +75,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) { content::Source<content::WebContentsDelegate>(browser()))); bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); @@ -85,38 +86,38 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, NoScriptAccessAfterSwapOut) { EXPECT_EQ(1, browser()->active_index()); // Wait for the navigation in the new tab to finish, if it hasn't. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); EXPECT_EQ("/files/navigate_opener.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); EXPECT_EQ(1, browser()->active_index()); // Should have the same SiteInstance. scoped_refptr<SiteInstance> blank_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, blank_site_instance); // We should have access to the opened tab's location. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(testScriptAccessToWindow());", &success)); EXPECT_TRUE(success); // Now navigate the new tab to a different site. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); ui_test_utils::NavigateToURL(browser(), https_server.GetURL("files/title1.html")); scoped_refptr<SiteInstance> new_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); // We should no longer have script access to the opened tab's location. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(testScriptAccessToWindow());", &success)); EXPECT_FALSE(success); @@ -145,13 +146,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Get the original SiteInstance for later comparison. scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Test clicking a rel=noreferrer + target=blank link. bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickNoRefTargetBlankLink());", &success)); EXPECT_TRUE(success); @@ -164,18 +165,18 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->active_index()); EXPECT_EQ("/files/title2.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); // Wait for the cross-site transition in the new tab to finish. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); WebContentsImpl* web_contents = static_cast<WebContentsImpl*>( - browser()->GetActiveWebContents()); + chrome::GetActiveWebContents(browser())); EXPECT_FALSE(web_contents->GetRenderManagerForTesting()-> pending_render_view_host()); // Should have a new SiteInstance. scoped_refptr<SiteInstance> noref_blank_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_NE(orig_site_instance, noref_blank_site_instance); } @@ -203,13 +204,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Get the original SiteInstance for later comparison. scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Test clicking a same-site rel=noreferrer + target=foo link. bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickSameSiteNoRefTargetedLink());", &success)); EXPECT_TRUE(success); @@ -222,18 +223,18 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->active_index()); EXPECT_EQ("/files/title2.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); // Wait for the cross-site transition in the new tab to finish. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); WebContentsImpl* web_contents = static_cast<WebContentsImpl*>( - browser()->GetActiveWebContents()); + chrome::GetActiveWebContents(browser())); EXPECT_FALSE(web_contents->GetRenderManagerForTesting()-> pending_render_view_host()); // Should have a new SiteInstance (in a new BrowsingInstance). scoped_refptr<SiteInstance> noref_blank_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_NE(orig_site_instance, noref_blank_site_instance); } @@ -260,13 +261,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Get the original SiteInstance for later comparison. scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Test clicking a target=blank link. bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickTargetBlankLink());", &success)); EXPECT_TRUE(success); @@ -280,13 +281,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(1, browser()->active_index()); // Wait for the cross-site transition in the new tab to finish. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); EXPECT_EQ("/files/title2.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); // Should have the same SiteInstance. scoped_refptr<SiteInstance> blank_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, blank_site_instance); } @@ -313,29 +314,29 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Get the original SiteInstance for later comparison. scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Test clicking a rel=noreferrer link. bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickNoRefLink());", &success)); EXPECT_TRUE(success); // Wait for the cross-site transition in the current tab to finish. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); // Opens in same tab. EXPECT_EQ(1, browser()->tab_count()); EXPECT_EQ(0, browser()->active_index()); EXPECT_EQ("/files/title2.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); // Should have the same SiteInstance. scoped_refptr<SiteInstance> noref_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, noref_site_instance); } @@ -362,7 +363,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Get the original SiteInstance for later comparison. scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Test clicking a target=foo link. @@ -370,7 +371,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, content::Source<content::WebContentsDelegate>(browser()))); bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); @@ -381,18 +382,18 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(1, browser()->active_index()); // Wait for the navigation in the new tab to finish, if it hasn't. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); EXPECT_EQ("/files/navigate_opener.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); EXPECT_EQ(1, browser()->active_index()); // Should have the same SiteInstance. scoped_refptr<SiteInstance> blank_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, blank_site_instance); // Now navigate the new tab to a different site. - content::WebContents* new_contents = browser()->GetActiveWebContents(); + content::WebContents* new_contents = chrome::GetActiveWebContents(browser()); ui_test_utils::NavigateToURL(browser(), https_server.GetURL("files/title1.html")); scoped_refptr<SiteInstance> new_site_instance( @@ -400,13 +401,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_NE(orig_site_instance, new_site_instance); // Clicking the original link in the first tab should cause us to swap back. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ui_test_utils::WindowedNotificationObserver navigation_observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<content::NavigationController>( &new_contents->GetController())); EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); @@ -415,7 +416,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Should have swapped back and shown the new tab again. EXPECT_EQ(1, browser()->active_index()); scoped_refptr<SiteInstance> revisit_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, revisit_site_instance); // If it navigates away to another process, the original window should @@ -423,13 +424,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ui_test_utils::NavigateToURL(browser(), https_server.GetURL("files/title1.html")); EXPECT_EQ(new_site_instance, - browser()->GetActiveWebContents()->GetSiteInstance()); - browser()->ActivateTabAt(0, true); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); + chrome::ActivateTabAt(browser(), 0, true); ui_test_utils::WindowedNotificationObserver close_observer( content::NOTIFICATION_WEB_CONTENTS_DESTROYED, content::Source<content::WebContents>(new_contents)); EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(testCloseWindow());", &success)); EXPECT_TRUE(success); @@ -463,7 +464,8 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, test_server()->GetURL(replacement_path)); // Get the original SiteInstance and RVHM for later comparison. - content::WebContents* opener_contents = browser()->GetActiveWebContents(); + content::WebContents* opener_contents = + chrome::GetActiveWebContents(browser()); scoped_refptr<SiteInstance> orig_site_instance( opener_contents->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); @@ -487,7 +489,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Wait for the navigation in the new tab to finish, if it hasn't, then // send it to post_message.html on a different site. - content::WebContents* foo_contents = browser()->GetActiveWebContents(); + content::WebContents* foo_contents = chrome::GetActiveWebContents(browser()); ui_test_utils::WaitForLoadStop(foo_contents); EXPECT_EQ("/files/navigate_opener.html", foo_contents->GetURL().path()); EXPECT_EQ(1, browser()->active_index()); @@ -498,11 +500,11 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_NE(orig_site_instance, foo_site_instance); // Second, a target=_blank window. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ui_test_utils::WindowedTabAddedNotificationObserver new_tab_observer2(( content::Source<content::WebContentsDelegate>(browser()))); EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickSameSiteTargetBlankLink());", &success)); EXPECT_TRUE(success); @@ -510,7 +512,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Wait for the navigation in the new tab to finish, if it hasn't, then // send it to post_message.html on the original site. - content::WebContents* new_contents = browser()->GetActiveWebContents(); + content::WebContents* new_contents = chrome::GetActiveWebContents(browser()); ui_test_utils::WaitForLoadStop(new_contents); EXPECT_EQ("/files/title2.html", new_contents->GetURL().path()); EXPECT_EQ(1, browser()->active_index()); @@ -604,9 +606,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, test_server()->GetURL(replacement_path)); // Get the original tab and SiteInstance for later comparison. - content::WebContents* orig_contents = browser()->GetActiveWebContents(); + content::WebContents* orig_contents = chrome::GetActiveWebContents(browser()); scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Test clicking a target=foo link. @@ -614,7 +616,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, content::Source<content::WebContentsDelegate>(browser()))); bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); @@ -625,32 +627,32 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(1, browser()->active_index()); // Wait for the navigation in the new tab to finish, if it hasn't. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); EXPECT_EQ("/files/navigate_opener.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); EXPECT_EQ(1, browser()->active_index()); // Should have the same SiteInstance. scoped_refptr<SiteInstance> blank_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, blank_site_instance); // Now navigate the original (opener) tab to a different site. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ui_test_utils::NavigateToURL(browser(), https_server.GetURL("files/title1.html")); scoped_refptr<SiteInstance> new_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); // The opened tab should be able to navigate the opener back to its process. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); ui_test_utils::WindowedNotificationObserver navigation_observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<content::NavigationController>( &orig_contents->GetController())); EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(navigateOpener());", &success)); EXPECT_TRUE(success); @@ -660,9 +662,9 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(1, browser()->active_index()); // Should have swapped back into this process. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); scoped_refptr<SiteInstance> revisit_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, revisit_site_instance); } @@ -690,7 +692,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Get the original SiteInstance for later comparison. scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Test clicking a target=foo link. @@ -698,7 +700,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, content::Source<content::WebContentsDelegate>(browser()))); bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); @@ -709,21 +711,21 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(1, browser()->active_index()); // Wait for the navigation in the new tab to finish, if it hasn't. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); EXPECT_EQ("/files/navigate_opener.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); EXPECT_EQ(1, browser()->active_index()); // Should have the same SiteInstance. scoped_refptr<SiteInstance> opened_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, opened_site_instance); // Now navigate the opened tab to a different site. ui_test_utils::NavigateToURL(browser(), https_server.GetURL("files/title1.html")); scoped_refptr<SiteInstance> new_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_NE(orig_site_instance, new_site_instance); // The original process should still be alive, since it is still used in the @@ -733,7 +735,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Navigate the first tab to a different site as well. The original process // should exit, since all of its views are now swapped out. - browser()->ActivateTabAt(0, true); + chrome::ActivateTabAt(browser(), 0, true); ui_test_utils::WindowedNotificationObserver exit_observer( content::NOTIFICATION_RENDERER_PROCESS_TERMINATED, content::Source<content::RenderProcessHost>(orig_process)); @@ -741,7 +743,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, https_server.GetURL("files/title1.html")); exit_observer.Wait(); scoped_refptr<SiteInstance> new_site_instance2( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(new_site_instance, new_site_instance2); } @@ -768,7 +770,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) { // Get the original SiteInstance for later comparison. scoped_refptr<SiteInstance> orig_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_TRUE(orig_site_instance != NULL); // Load a cross-site page that fails with a 204 error. @@ -776,31 +778,31 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) { // We should still be looking at the normal page. scoped_refptr<SiteInstance> post_nav_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, post_nav_site_instance); EXPECT_EQ("/files/click-noreferrer-links.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); // Renderer-initiated navigations should work. bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickNoRefLink());", &success)); EXPECT_TRUE(success); // Wait for the cross-site transition in the current tab to finish. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); // Opens in same tab. EXPECT_EQ(1, browser()->tab_count()); EXPECT_EQ(0, browser()->active_index()); EXPECT_EQ("/files/title2.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); // Should have the same SiteInstance. scoped_refptr<SiteInstance> noref_site_instance( - browser()->GetActiveWebContents()->GetSiteInstance()); + chrome::GetActiveWebContents(browser())->GetSiteInstance()); EXPECT_EQ(orig_site_instance, noref_site_instance); } @@ -849,7 +851,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, BackForwardNotStale) { https_server.GetURL(replacement_path_b3)); // History is now [blank, A1, B1, B2, *B3]. - content::WebContents* contents = browser()->GetActiveWebContents(); + content::WebContents* contents = chrome::GetActiveWebContents(browser()); EXPECT_EQ(5, contents->GetController().GetEntryCount()); // Open another tab in same process to keep this process alive. @@ -956,7 +958,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, content::Source<content::WebContentsDelegate>(browser()))); bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), L"", + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(clickSameSiteTargetedLink());", &success)); EXPECT_TRUE(success); @@ -967,13 +969,13 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, EXPECT_EQ(1, browser()->active_index()); // Wait for the navigation in the new tab to finish, if it hasn't. - ui_test_utils::WaitForLoadStop(browser()->GetActiveWebContents()); + ui_test_utils::WaitForLoadStop(chrome::GetActiveWebContents(browser())); EXPECT_EQ("/files/navigate_opener.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); EXPECT_EQ(1, browser()->active_index()); RenderViewHost* rvh = - browser()->GetActiveWebContents()->GetRenderViewHost(); + chrome::GetActiveWebContents(browser())->GetRenderViewHost(); EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( rvh, L"", L"window.domAutomationController.send(" @@ -983,7 +985,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, // Now navigate the new tab to a different site. This should swap out the // tab's existing RenderView, causing it become hidden. - browser()->ActivateTabAt(1, true); + chrome::ActivateTabAt(browser(), 1, true); ui_test_utils::NavigateToURL(browser(), https_server.GetURL("files/title1.html")); @@ -1000,16 +1002,16 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ui_test_utils::WindowedNotificationObserver back_nav_load_observer( content::NOTIFICATION_NAV_ENTRY_COMMITTED, content::Source<content::NavigationController>( - &browser()->GetActiveWebContents()->GetController())); + &chrome::GetActiveWebContents(browser())->GetController())); chrome::GoBack(browser(), CURRENT_TAB); back_nav_load_observer.Wait(); } EXPECT_EQ("/files/navigate_opener.html", - browser()->GetActiveWebContents()->GetURL().path()); + chrome::GetActiveWebContents(browser())->GetURL().path()); - EXPECT_EQ(rvh, browser()->GetActiveWebContents()->GetRenderViewHost()); + EXPECT_EQ(rvh, chrome::GetActiveWebContents(browser())->GetRenderViewHost()); EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( rvh, L"", @@ -1084,20 +1086,20 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, LeakingRenderViewHosts) { // was a problem. This is no longer the case. GURL navigated_url(test_server()->GetURL("files/title2.html")); ui_test_utils::NavigateToURL(browser(), navigated_url); - SiteInstance* site_instance1 = browser()->GetActiveWebContents()-> + SiteInstance* site_instance1 = chrome::GetActiveWebContents(browser())-> GetRenderViewHost()->GetSiteInstance(); // Observe the newly created render_view_host to make sure it will not leak. RenderViewHostObserverArray rvh_observers; - rvh_observers.AddObserverToRVH(browser()->GetActiveWebContents()-> + rvh_observers.AddObserverToRVH(chrome::GetActiveWebContents(browser())-> GetRenderViewHost()); GURL view_source_url(chrome::kViewSourceScheme + std::string(":") + navigated_url.spec()); ui_test_utils::NavigateToURL(browser(), view_source_url); - rvh_observers.AddObserverToRVH(browser()->GetActiveWebContents()-> + rvh_observers.AddObserverToRVH(chrome::GetActiveWebContents(browser())-> GetRenderViewHost()); - SiteInstance* site_instance2 = browser()->GetActiveWebContents()-> + SiteInstance* site_instance2 = chrome::GetActiveWebContents(browser())-> GetRenderViewHost()->GetSiteInstance(); // Ensure that view-source navigations force a new SiteInstance. @@ -1106,10 +1108,10 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, LeakingRenderViewHosts) { // Now navigate to a different instance so that we swap out again. ui_test_utils::NavigateToURL(browser(), https_server.GetURL("files/title2.html")); - rvh_observers.AddObserverToRVH(browser()->GetActiveWebContents()-> + rvh_observers.AddObserverToRVH(chrome::GetActiveWebContents(browser())-> GetRenderViewHost()); // This used to leak a render view host. - browser()->CloseTabContents(browser()->GetActiveWebContents()); + chrome::CloseWebContents(browser(), chrome::GetActiveWebContents(browser())); EXPECT_EQ(0U, rvh_observers.GetNumObservers()); } diff --git a/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc b/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc index 10490fa..4704580 100644 --- a/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc +++ b/content/browser/renderer_host/resource_dispatcher_host_browsertest.cc @@ -6,6 +6,7 @@ #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/download/download_manager_impl.h" @@ -76,7 +77,7 @@ class ResourceDispatcherHostBrowserTest : public InProcessBrowserTest, } content::RenderViewHost* render_view_host() { - return browser()->GetActiveWebContents()->GetRenderViewHost(); + return chrome::GetActiveWebContents(browser())->GetRenderViewHost(); } GURL GetMockURL(const std::string& file) { @@ -88,7 +89,7 @@ class ResourceDispatcherHostBrowserTest : public InProcessBrowserTest, int expected_navigations) { string16 expected_title16(ASCIIToUTF16(expected_title)); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title16); + chrome::GetActiveWebContents(browser()), expected_title16); ui_test_utils::NavigateToURLBlockUntilNavigationsComplete( browser(), url, expected_navigations); EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); @@ -217,7 +218,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, SyncXMLHttpRequest) { // Let's check the XMLHttpRequest ran successfully. bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(DidSyncRequestSucceed());", &success)); @@ -235,7 +236,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, // Let's check the XMLHttpRequest ran successfully. bool success = false; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"window.domAutomationController.send(DidSucceed());", &success)); @@ -386,7 +387,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, browser(), failed_url, 2); EXPECT_NE(ASCIIToUTF16("set cookie on unload"), - browser()->GetActiveWebContents()->GetTitle()); + chrome::GetActiveWebContents(browser())->GetTitle()); // Check that the cookie was set, meaning that the onunload handler ran. EXPECT_EQ("onunloadCookie=foo", GetCookies(url)); @@ -402,7 +403,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, // off the navigation, and wait to see that the tab loads. string16 expected_title16(ASCIIToUTF16("Title Of Awesomeness")); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title16); + chrome::GetActiveWebContents(browser()), expected_title16); bool success; GURL test_url(test_server()->GetURL("files/title2.html")); @@ -410,7 +411,7 @@ IN_PROC_BROWSER_TEST_F(ResourceDispatcherHostBrowserTest, test_url.possibly_invalid_spec() + "';" + "window.domAutomationController.send(true);"; EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", ASCIIToWide(redirect_script), &success)); EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); } diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index effe290..06c2ecd 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc @@ -6,6 +6,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_commands.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/notification_service.h" @@ -55,11 +56,11 @@ class SessionHistoryTest : public InProcessBrowserTest { } std::string GetTabTitle() { - return UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle()); + return UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle()); } GURL GetTabURL() { - return browser()->GetActiveWebContents()->GetURL(); + return chrome::GetActiveWebContents(browser())->GetURL(); } GURL GetURL(const std::string file) { @@ -70,7 +71,7 @@ class SessionHistoryTest : public InProcessBrowserTest { const std::string& expected_title) { string16 expected_title16(ASCIIToUTF16(expected_title)); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title16); + chrome::GetActiveWebContents(browser()), expected_title16); ui_test_utils::NavigateToURL(browser(), GetURL(filename)); ASSERT_EQ(expected_title16, title_watcher.WaitAndGetTitle()); } @@ -435,14 +436,14 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, LocationChangeInSubframe) { IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) { int length; ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"domAutomationController.send(history.length)", &length)); EXPECT_EQ(1, length); ui_test_utils::NavigateToURL(browser(), GetURL("title1.html")); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"domAutomationController.send(history.length)", &length)); EXPECT_EQ(2, length); @@ -450,7 +451,7 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) { ui_test_utils::NavigateToURL(browser(), GetURL("record_length.html")); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"domAutomationController.send(history.length)", &length)); EXPECT_EQ(3, length); @@ -461,7 +462,7 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) { ui_test_utils::NavigateToURL(browser(), GetURL("title2.html")); ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt( - browser()->GetActiveWebContents()->GetRenderViewHost(), + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"", L"domAutomationController.send(history.length)", &length)); EXPECT_EQ(2, length); } diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index bdd3843..3a8bd80 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc @@ -10,6 +10,7 @@ #include "base/synchronization/waitable_event.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/renderer_host/render_view_host_impl.h" @@ -202,7 +203,7 @@ class SpeechRecognitionBrowserTest : public InProcessBrowserTest { mouse_event.x = 0; mouse_event.y = 0; mouse_event.clickCount = 1; - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); ui_test_utils::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, @@ -225,7 +226,7 @@ class SpeechRecognitionBrowserTest : public InProcessBrowserTest { // then sets the URL fragment as 'pass' if it received the expected string. LoadAndStartSpeechRecognitionTest(filename); - EXPECT_EQ("pass", browser()->GetActiveWebContents()->GetURL().ref()); + EXPECT_EQ("pass", chrome::GetActiveWebContents(browser())->GetURL().ref()); } // InProcessBrowserTest methods. diff --git a/content/browser/webkit_browsertest.cc b/content/browser/webkit_browsertest.cc index a024d94..677a5d0 100644 --- a/content/browser/webkit_browsertest.cc +++ b/content/browser/webkit_browsertest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/web_contents/web_contents_impl.h" @@ -28,7 +29,7 @@ IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, AbortOnEnd) { ui_test_utils::NavigateToURL(browser(), url); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); // If you are seeing this test fail, please strongly investigate the // possibility that http://crbug.com/75604 and // https://bugs.webkit.org/show_bug.cgi?id=71122 have reverted before @@ -52,6 +53,6 @@ IN_PROC_BROWSER_TEST_F(WebKitBrowserTest, XsltBadImport) { ui_test_utils::NavigateToURL(browser(), url); - WebContents* web_contents = browser()->GetActiveWebContents(); + WebContents* web_contents = chrome::GetActiveWebContents(browser()); EXPECT_FALSE(web_contents->IsCrashed()); } diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index c838dae..0532452 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -12,6 +12,7 @@ #include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/ui_test_utils.h" #include "content/browser/worker_host/worker_process_host.h" #include "content/browser/worker_host/worker_service_impl.h" @@ -287,7 +288,7 @@ class WorkerTest : public InProcessBrowserTest { GURL url = GetTestURL(test_case, query); const string16 expected_title = ASCIIToUTF16("OK"); ui_test_utils::TitleWatcher title_watcher( - browser->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser), expected_title); ui_test_utils::NavigateToURL(browser, url); string16 final_title = title_watcher.WaitAndGetTitle(); EXPECT_EQ(expected_title, final_title); diff --git a/content/test/DEPS b/content/test/DEPS index fc2173a..08c910c 100644 --- a/content/test/DEPS +++ b/content/test/DEPS @@ -1,5 +1,6 @@ include_rules = [ "+chrome/browser/ui/browser.h", + "+chrome/browser/ui/browser_tabstrip.h", # Testing utilities can access anything in content/ "+content", "+media/base", # For ChannelLayout in WebRTC tests. diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc index 70468bf..f457e87 100644 --- a/content/test/layout_browsertest.cc +++ b/content/test/layout_browsertest.cc @@ -13,6 +13,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/layout_test_http_server.h" #include "chrome/test/base/ui_test_utils.h" @@ -187,7 +188,7 @@ void InProcessBrowserLayoutTest::RunLayoutTestInternal( LOG(INFO) << "Navigating to URL " << url << " and blocking."; const string16 expected_title = ASCIIToUTF16("done"); ui_test_utils::TitleWatcher title_watcher( - browser()->GetActiveWebContents(), expected_title); + chrome::GetActiveWebContents(browser()), expected_title); ui_test_utils::NavigateToURL(browser(), url); LOG(INFO) << "Navigation completed, now waiting for title."; string16 final_title = title_watcher.WaitAndGetTitle(); |