diff options
32 files changed, 49 insertions, 57 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index b020e98..f61de36 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -1075,7 +1075,7 @@ void TestingAutomationProvider::OpenNewBrowserWindowOfType( Browser* browser = new Browser( Browser::CreateParams(static_cast<Browser::Type>(type), profile_, chrome::HOST_DESKTOP_TYPE_NATIVE)); - chrome::AddBlankTabAt(browser, -1, true); + chrome::AddTabAt(browser, GURL(), -1, true); if (show) browser->window()->Show(); } @@ -1093,7 +1093,7 @@ void TestingAutomationProvider::OpenNewBrowserWindow( Browser* browser = new Browser( Browser::CreateParams(Browser::TYPE_TABBED, profile_, chrome::HOST_DESKTOP_TYPE_NATIVE)); - chrome::AddBlankTabAt(browser, -1, true); + chrome::AddTabAt(browser, GURL(), -1, true); if (show) browser->window()->Show(); } diff --git a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc index 939e8eb..bdcec35 100644 --- a/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc @@ -127,12 +127,12 @@ IN_PROC_BROWSER_TEST_F(WebrtcApprtcBrowserTest, MANUAL_WorksOnApprtc) { GURL room_url = GURL(base::StringPrintf("localhost:9999?r=room_%d", base::RandInt(0, 65536))); - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); content::WebContents* left_tab = OpenPageAndAcceptUserMedia(room_url); // TODO(phoglund): Remove when this bug gets fixed: // http://code.google.com/p/webrtc/issues/detail?id=1742 SleepInJavascript(left_tab, 5000); - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); content::WebContents* right_tab = OpenPageAndAcceptUserMedia(room_url); ASSERT_TRUE(WaitForCallToComeUp(left_tab)); diff --git a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc index 45e6a7f..9ea33cb 100644 --- a/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_audio_quality_browsertest.cc @@ -405,7 +405,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcAudioQualityBrowserTest, content::WebContents* left_tab = browser()->tab_strip_model()->GetActiveWebContents(); - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); content::WebContents* right_tab = browser()->tab_strip_model()->GetActiveWebContents(); ui_test_utils::NavigateToURL( diff --git a/chrome/browser/media/chrome_webrtc_browsertest.cc b/chrome/browser/media/chrome_webrtc_browsertest.cc index 3aae51b..6361195 100644 --- a/chrome/browser/media/chrome_webrtc_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_browsertest.cc @@ -192,7 +192,7 @@ class WebrtcBrowserTest : public WebRtcTestBase { } content::WebContents* OpenTestPageAndGetUserMediaInNewTab() { - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); ui_test_utils::NavigateToURL( browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage)); content::WebContents* left_tab = @@ -335,7 +335,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcBrowserTest, SleepInJavascript(left_tab, 10000); // Start measurements. - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); ui_test_utils::NavigateToURL(browser(), GURL("chrome://webrtc-internals")); content::WebContents* webrtc_internals_tab = browser()->tab_strip_model()->GetActiveWebContents(); diff --git a/chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc b/chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc index 3335c0c..60baf2a 100644 --- a/chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc @@ -126,7 +126,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcTypingDetectionBrowserTest, content::WebContents* left_tab = browser()->tab_strip_model()->GetActiveWebContents(); - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); content::WebContents* right_tab = browser()->tab_strip_model()->GetActiveWebContents(); ui_test_utils::NavigateToURL( diff --git a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc index 22840d8..162e954 100644 --- a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc @@ -336,7 +336,7 @@ IN_PROC_BROWSER_TEST_F(WebrtcVideoQualityBrowserTest, browser()->tab_strip_model()->GetActiveWebContents(); GetUserMediaAndAccept(left_tab); - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); content::WebContents* right_tab = browser()->tab_strip_model()->GetActiveWebContents(); ui_test_utils::NavigateToURL( diff --git a/chrome/browser/sessions/session_restore_browsertest.cc b/chrome/browser/sessions/session_restore_browsertest.cc index 8b8c43e..e1d6e08 100644 --- a/chrome/browser/sessions/session_restore_browsertest.cc +++ b/chrome/browser/sessions/session_restore_browsertest.cc @@ -205,7 +205,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, NoSessionRestoreNewWindowChromeOS) { ui_test_utils::NavigateToURL(browser(), url); Browser* incognito_browser = CreateIncognitoBrowser(); - chrome::AddBlankTabAt(incognito_browser, -1, true); + chrome::AddTabAt(incognito_browser, GURL(), -1, true); incognito_browser->window()->Show(); // Close the normal browser. After this we only have the incognito window @@ -439,7 +439,7 @@ IN_PROC_BROWSER_TEST_F(SessionRestoreTest, IncognitotoNonIncognito) { // Create a new incognito window. Browser* incognito_browser = CreateIncognitoBrowser(); - chrome::AddBlankTabAt(incognito_browser, -1, true); + chrome::AddTabAt(incognito_browser, GURL(), -1, true); incognito_browser->window()->Show(); // Close the normal browser. After this we only have the incognito window diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc index d22eedc..440ed0a 100644 --- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc +++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc @@ -209,14 +209,14 @@ void ChromeShellDelegate::Observe(int type, Browser* browser = chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()); if (browser && browser->is_type_tabbed()) { - chrome::AddBlankTabAt(browser, -1, true); + chrome::AddTabAt(browser, GURL(), -1, true); return; } chrome::ScopedTabbedBrowserDisplayer displayer( ProfileManager::GetDefaultProfileOrOffTheRecord(), chrome::HOST_DESKTOP_TYPE_ASH); - chrome::AddBlankTabAt(displayer.browser(), -1, true); + chrome::AddTabAt(displayer.browser(), GURL(), -1, true); } break; } diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc index 662144d..87a5e6a 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc @@ -731,7 +731,7 @@ class V1App { profile, chrome::HOST_DESKTOP_TYPE_ASH); browser_.reset(chrome::CreateBrowserWithTestWindowForParams(¶ms)); - chrome::AddBlankTabAt(browser_.get(), 0, true); + chrome::AddTabAt(browser_.get(), GURL(), 0, true); } virtual ~V1App() { diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc index 3c740185..6f557fb 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc @@ -1107,7 +1107,7 @@ IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, TabOpensToJustRight) { EXPECT_EQ(0, tab_strip->GetIndexOfWebContents(dialog_invoker)); // Open a tab to about:blank in the background at the end of the tab strip. - chrome::AddBlankTabAt(browser(), -1, false); + chrome::AddTabAt(browser(), GURL(), -1, false); // Tabs should now be: / rAc() \/ blank \. EXPECT_EQ(2, tab_strip->count()); EXPECT_EQ(0, tab_strip->active_index()); diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc index 8ed4f7a..e62b954 100644 --- a/chrome/browser/ui/browser_browsertest.cc +++ b/chrome/browser/ui/browser_browsertest.cc @@ -1915,7 +1915,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { // Open a popup browser with a single blank foreground tab. Browser* popup_browser = new Browser( Browser::CreateParams(Browser::TYPE_POPUP, browser()->profile())); - chrome::AddBlankTabAt(popup_browser, -1, true); + chrome::AddTabAt(popup_browser, GURL(), -1, true); EXPECT_EQ(1, popup_browser->tab_strip_model()->count()); // Now try opening another tab in the popup browser. @@ -1932,7 +1932,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { // Open an app frame browser with a single blank foreground tab. Browser* app_browser = new Browser(Browser::CreateParams::CreateForApp( L"Test", browser()->profile(), false)); - chrome::AddBlankTabAt(app_browser, -1, true); + chrome::AddTabAt(app_browser, GURL(), -1, true); EXPECT_EQ(1, app_browser->tab_strip_model()->count()); // Now try opening another tab in the app browser. @@ -1950,7 +1950,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest2, NoTabsInPopups) { // Open an app frame popup browser with a single blank foreground tab. Browser* app_popup_browser = new Browser(Browser::CreateParams::CreateForApp( L"Test", browser()->profile(), false)); - chrome::AddBlankTabAt(app_popup_browser, -1, true); + chrome::AddTabAt(app_popup_browser, GURL(), -1, true); EXPECT_EQ(1, app_popup_browser->tab_strip_model()->count()); // Now try opening another tab in the app popup browser. diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index 62974c6..1300c33 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -303,7 +303,7 @@ void NewEmptyWindow(Profile* profile, HostDesktopType desktop_type) { Browser* OpenEmptyWindow(Profile* profile, HostDesktopType desktop_type) { Browser* browser = new Browser( Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); - AddBlankTabAt(browser, -1, true); + AddTabAt(browser, GURL(), -1, true); browser->window()->Show(); return browser; } @@ -484,14 +484,14 @@ void NewTab(Browser* browser) { TabStripModel::NEW_TAB_ENUM_COUNT); if (browser->is_type_tabbed()) { - AddBlankTabAt(browser, -1, true); + AddTabAt(browser, GURL(), -1, true); browser->tab_strip_model()->GetActiveWebContents()->GetView()-> RestoreFocus(); } else { ScopedTabbedBrowserDisplayer displayer(browser->profile(), browser->host_desktop_type()); Browser* b = displayer.browser(); - AddBlankTabAt(b, -1, true); + AddTabAt(b, GURL(), -1, true); b->window()->Show(); // The call to AddBlankTabAt above did not set the focus to the tab as its // window was not active, so we have to do it explicitly. diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc index 8e972da..3488e706 100644 --- a/chrome/browser/ui/browser_focus_uitest.cc +++ b/chrome/browser/ui/browser_focus_uitest.cc @@ -378,7 +378,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, new Browser(Browser::CreateParams(browser()->profile(), browser()->host_desktop_type())); ASSERT_TRUE(browser2); - chrome::AddBlankTabAt(browser2, -1, true); + chrome::AddTabAt(browser2, GURL(), -1, true); browser2->window()->Show(); Browser* focused_browser = NULL; diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 28424fd..20c0723 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -112,7 +112,7 @@ Browser* BrowserNavigatorTest::CreateEmptyBrowserForType(Browser::Type type, Profile* profile) { Browser* browser = new Browser( Browser::CreateParams(type, profile, chrome::GetActiveDesktop())); - chrome::AddBlankTabAt(browser, -1, true); + chrome::AddTabAt(browser, GURL(), -1, true); return browser; } @@ -122,7 +122,7 @@ Browser* BrowserNavigatorTest::CreateEmptyBrowserForApp(Browser::Type type, Browser::CreateParams::CreateForApp( Browser::TYPE_POPUP, "Test", gfx::Rect(), profile, chrome::GetActiveDesktop())); - chrome::AddBlankTabAt(browser, -1, true); + chrome::AddTabAt(browser, GURL(), -1, true); return browser; } diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.cc b/chrome/browser/ui/browser_tab_strip_model_delegate.cc index 1c446f1..8486b17 100644 --- a/chrome/browser/ui/browser_tab_strip_model_delegate.cc +++ b/chrome/browser/ui/browser_tab_strip_model_delegate.cc @@ -39,10 +39,10 @@ BrowserTabStripModelDelegate::~BrowserTabStripModelDelegate() { //////////////////////////////////////////////////////////////////////////////// // BrowserTabStripModelDelegate, TabStripModelDelegate implementation: -void BrowserTabStripModelDelegate::AddURLTabAt(const GURL& url, - int index, - bool foreground) { - chrome::AddURLTabAt(browser_, url, index, foreground); +void BrowserTabStripModelDelegate::AddTabAt(const GURL& url, + int index, + bool foreground) { + chrome::AddTabAt(browser_, url, index, foreground); } Browser* BrowserTabStripModelDelegate::CreateNewStripWithContents( diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.h b/chrome/browser/ui/browser_tab_strip_model_delegate.h index 9d56e72..6411738 100644 --- a/chrome/browser/ui/browser_tab_strip_model_delegate.h +++ b/chrome/browser/ui/browser_tab_strip_model_delegate.h @@ -20,7 +20,7 @@ class BrowserTabStripModelDelegate : public TabStripModelDelegate { private: // Overridden from TabStripModelDelegate: - virtual void AddURLTabAt(const GURL& url, + virtual void AddTabAt(const GURL& url, int index, bool foreground) OVERRIDE; virtual Browser* CreateNewStripWithContents( diff --git a/chrome/browser/ui/browser_tabstrip.cc b/chrome/browser/ui/browser_tabstrip.cc index d0bee66..1018bbd 100644 --- a/chrome/browser/ui/browser_tabstrip.cc +++ b/chrome/browser/ui/browser_tabstrip.cc @@ -18,7 +18,7 @@ namespace chrome { -void AddURLTabAt(Browser* browser, const GURL& url, int idx, bool foreground) { +void AddTabAt(Browser* browser, const GURL& url, int idx, bool foreground) { // Time new tab page creation time. We keep track of the timing data in // WebContents, but we want to include the time it takes to create the // WebContents object too. @@ -34,10 +34,6 @@ void AddURLTabAt(Browser* browser, const GURL& url, int idx, bool foreground) { core_tab_helper->set_new_tab_start_time(new_tab_start_time); } -void AddBlankTabAt(Browser* browser, int index, bool foreground) { - AddURLTabAt(browser, GURL(), index, foreground); -} - content::WebContents* AddSelectedTabWithURL( Browser* browser, const GURL& url, diff --git a/chrome/browser/ui/browser_tabstrip.h b/chrome/browser/ui/browser_tabstrip.h index a13699d..6d1055c 100644 --- a/chrome/browser/ui/browser_tabstrip.h +++ b/chrome/browser/ui/browser_tabstrip.h @@ -27,11 +27,7 @@ namespace chrome { // Adds a tab to the tab strip of the specified browser and loads |url| into it. // If |url| is an empty URL, then the new tab-page is laoded. An |index| of -1 // means to append it to the end of the tab strip. -void AddURLTabAt(Browser* browser, const GURL& url, int index, bool foreground); - -// Adds a blank tab to the tab strip of the specified browser; an |index| of -1 -// means to append it to the end of the tab strip. -void AddBlankTabAt(Browser* browser, int index, bool foreground); +void AddTabAt(Browser* browser, const GURL& url, int index, bool foreground); // Adds a selected tab with the specified URL and transition, returns the // created WebContents. diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 55c26f9..d53b2a0 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -675,7 +675,7 @@ NSImage* Overlay(NSImage* ground, NSImage* overlay, CGFloat alpha) { content::RecordAction(UserMetricsAction("NewTab_Button")); UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", TabStripModel::NEW_TAB_BUTTON, TabStripModel::NEW_TAB_ENUM_COUNT); - tabStripModel_->delegate()->AddURLTabAt(GURL(), -1, true); + tabStripModel_->delegate()->AddTabAt(GURL(), -1, true); } // (Private) Returns the number of open tabs in the tab strip. This is the diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc index 4635d35..8ebb594 100644 --- a/chrome/browser/ui/extensions/extension_install_ui_default.cc +++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc @@ -62,7 +62,7 @@ Browser* FindOrCreateVisibleBrowser(Profile* profile) { profile, chrome::GetActiveDesktop()); Browser* browser = displayer.browser(); if (browser->tab_strip_model()->count() == 0) - chrome::AddBlankTabAt(browser, -1, true); + chrome::AddTabAt(browser, GURL(), -1, true); return browser; } 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 ec8f5e3..312d7e3 100644 --- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -1172,7 +1172,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) { // For some reason we can't use AddSelectedTabWithURL here on ChromeOS. It // could be some delicate assumption about the tab starting off unselected or // something relating to user gesture. - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); ui_test_utils::NavigateToURL(browser(), url); WebContents* web_contents_2 = browser()->tab_strip_model()->GetActiveWebContents(); @@ -1295,7 +1295,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) { FindBarController::kKeepResultsInFindBox); // Now create a second tab and load the same page. - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); ui_test_utils::NavigateToURL(browser(), url); WebContents* web_contents_2 = browser()->tab_strip_model()->GetActiveWebContents(); @@ -1529,7 +1529,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, EXPECT_EQ(ASCIIToUTF16("1 of 1"), GetMatchCountText()); // Next, do a search in a second tab. - chrome::AddBlankTabAt(browser(), -1, true); + chrome::AddTabAt(browser(), GURL(), -1, true); ui_test_utils::NavigateToURL(browser(), url); WebContents* web_contents_2 = browser()->tab_strip_model()->GetActiveWebContents(); diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc index cd69607..df41617 100644 --- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc @@ -2185,7 +2185,7 @@ void TabStripGtk::OnNewTabClicked(GtkWidget* widget) { content::RecordAction(UserMetricsAction("NewTab_Button")); UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", TabStripModel::NEW_TAB_BUTTON, TabStripModel::NEW_TAB_ENUM_COUNT); - model_->delegate()->AddURLTabAt(GURL(), -1, true); + model_->delegate()->AddTabAt(GURL(), -1, true); break; case 2: { // On middle-click, try to parse the PRIMARY selection as a URL and load diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 0d5b9a9..e1b0c1d 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -871,7 +871,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( if (!browser->tab_strip_model()->GetActiveWebContents()) { // TODO: this is a work around for 110909. Figure out why it's needed. if (!browser->tab_strip_model()->count()) - chrome::AddBlankTabAt(browser, -1, true); + chrome::AddTabAt(browser, GURL(), -1, true); else browser->tab_strip_model()->ActivateTabAt(0, false); } diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc index c3ea0e4..4dda027 100644 --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc @@ -417,7 +417,7 @@ void OneClickSigninSyncStarter::EnsureBrowser() { if (!browser_) { browser_ = new Browser(Browser::CreateParams(profile_, desktop_type_)); - chrome::AddBlankTabAt(browser_, -1, true); + chrome::AddTabAt(browser_, GURL(), -1, true); } browser_->window()->Show(); } diff --git a/chrome/browser/ui/tabs/tab_strip_model.cc b/chrome/browser/ui/tabs/tab_strip_model.cc index 078756f..ef7e828 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.cc +++ b/chrome/browser/ui/tabs/tab_strip_model.cc @@ -944,7 +944,7 @@ void TabStripModel::ExecuteContextMenuCommand( UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", TabStripModel::NEW_TAB_CONTEXT_MENU, TabStripModel::NEW_TAB_ENUM_COUNT); - delegate()->AddURLTabAt(GURL(), context_index + 1, true); + delegate()->AddTabAt(GURL(), context_index + 1, true); break; case CommandReload: { diff --git a/chrome/browser/ui/tabs/tab_strip_model_delegate.h b/chrome/browser/ui/tabs/tab_strip_model_delegate.h index b9071b8..71af254 100644 --- a/chrome/browser/ui/tabs/tab_strip_model_delegate.h +++ b/chrome/browser/ui/tabs/tab_strip_model_delegate.h @@ -51,7 +51,7 @@ class TabStripModelDelegate { // Adds a tab to the model and loads |url| in the tab. If |url| is an empty // URL, then the new tab-page is loaded instead. An |index| value of -1 // means to append the contents to the end of the tab strip. - virtual void AddURLTabAt(const GURL& url, int index, bool foreground) = 0; + virtual void AddTabAt(const GURL& url, int index, bool foreground) = 0; // Asks for a new TabStripModel to be created and the given web contentses to // be added to it. Its size and position are reflected in |window_bounds|. diff --git a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc index bb09460..af1df5f 100644 --- a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc +++ b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.cc @@ -13,7 +13,7 @@ TestTabStripModelDelegate::TestTabStripModelDelegate() { TestTabStripModelDelegate::~TestTabStripModelDelegate() { } -void TestTabStripModelDelegate::AddURLTabAt(const GURL& url, +void TestTabStripModelDelegate::AddTabAt(const GURL& url, int index, bool foreground) { } diff --git a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.h b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.h index bb448fc..2180173 100644 --- a/chrome/browser/ui/tabs/test_tab_strip_model_delegate.h +++ b/chrome/browser/ui/tabs/test_tab_strip_model_delegate.h @@ -16,7 +16,7 @@ class TestTabStripModelDelegate : public TabStripModelDelegate { virtual ~TestTabStripModelDelegate(); // Overridden from TabStripModelDelegate: - virtual void AddURLTabAt(const GURL& url, int index, bool foregroud) OVERRIDE; + virtual void AddTabAt(const GURL& url, int index, bool foregroud) OVERRIDE; virtual Browser* CreateNewStripWithContents( const std::vector<NewStripContents>& contentses, const gfx::Rect& window_bounds, diff --git a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc index d9aab04..9be8e98 100644 --- a/chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc +++ b/chrome/browser/ui/views/frame/app_non_client_frame_view_ash_browsertest.cc @@ -66,7 +66,7 @@ class AppNonClientFrameViewAshTest : public InProcessBrowserTest { params.initial_show_state = ui::SHOW_STATE_MAXIMIZED; params.app_type = Browser::APP_TYPE_HOST; app_browser_ = new Browser(params); - chrome::AddBlankTabAt(app_browser_, -1, true); + chrome::AddTabAt(app_browser_, GURL(), -1, true); app_browser_->window()->Show(); } diff --git a/chrome/browser/ui/views/frame/browser_view_browsertest.cc b/chrome/browser/ui/views/frame/browser_view_browsertest.cc index 1e2784d..26da81c 100644 --- a/chrome/browser/ui/views/frame/browser_view_browsertest.cc +++ b/chrome/browser/ui/views/frame/browser_view_browsertest.cc @@ -47,8 +47,8 @@ IN_PROC_BROWSER_TEST_F(BrowserViewTest, CloseWithTabs) { Browser* browser2 = new Browser(Browser::CreateParams(browser()->profile(), browser()->host_desktop_type())); - chrome::AddBlankTabAt(browser2, -1, true); - chrome::AddBlankTabAt(browser2, -1, true); + chrome::AddTabAt(browser2, GURL(), -1, true); + chrome::AddTabAt(browser2, GURL(), -1, true); TestWebContentsObserver observer( browser2->tab_strip_model()->GetWebContentsAt(0), browser2->tab_strip_model()->GetWebContentsAt(1)); diff --git a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc index b9b3e9f..5b40235 100644 --- a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc +++ b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc @@ -60,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(BrowserViewFocusTest, DISABLED_BrowsersRememberFocus) { new Browser(Browser::CreateParams(browser()->profile(), browser()->host_desktop_type())); ASSERT_TRUE(browser2); - chrome::AddBlankTabAt(browser2, -1, true); + chrome::AddTabAt(browser2, GURL(), -1, true); browser2->window()->Show(); ui_test_utils::NavigateToURL(browser2, url); 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 f0c4050..90083b0 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -353,7 +353,7 @@ bool BrowserTabStripController::IsCompatibleWith(TabStrip* other) const { } void BrowserTabStripController::CreateNewTab() { - model_->delegate()->AddURLTabAt(GURL(), -1, true); + model_->delegate()->AddTabAt(GURL(), -1, true); } void BrowserTabStripController::CreateNewTabWithLocation( @@ -364,7 +364,7 @@ void BrowserTabStripController::CreateNewTabWithLocation( AutocompleteClassifierFactory::GetForProfile(profile())->Classify( location, false, false, &match, NULL); if (match.destination_url.is_valid()) - model_->delegate()->AddURLTabAt(match.destination_url, -1, true); + model_->delegate()->AddTabAt(match.destination_url, -1, true); } bool BrowserTabStripController::IsIncognito() { |