summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 01:55:38 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-29 01:55:38 +0000
commit715af7e54de3111942c62841a64c6f3584c93877 (patch)
tree2668603d9deb872ea71a7ca319639a68f81e0b0a /chrome/browser/views
parent451bbe386a9fc28d4ea7c43277fce65248edba20 (diff)
downloadchromium_src-715af7e54de3111942c62841a64c6f3584c93877.zip
chromium_src-715af7e54de3111942c62841a64c6f3584c93877.tar.gz
chromium_src-715af7e54de3111942c62841a64c6f3584c93877.tar.bz2
Nukes one of the AddTabWithURL variants.
BUG=none TEST=none Review URL: http://codereview.chromium.org/1736022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/app_launcher.cc13
-rw-r--r--chrome/browser/views/find_bar_host_interactive_uitest.cc4
2 files changed, 11 insertions, 6 deletions
diff --git a/chrome/browser/views/app_launcher.cc b/chrome/browser/views/app_launcher.cc
index 7cea6af..240a926 100644
--- a/chrome/browser/views/app_launcher.cc
+++ b/chrome/browser/views/app_launcher.cc
@@ -392,8 +392,9 @@ void AppLauncher::AddTabWithURL(const GURL& url,
case chromeos::StatusAreaView::OPEN_TABS_ON_LEFT: {
// Add the new tab at the first non-pinned location.
int index = browser_->tabstrip_model()->IndexOfFirstNonMiniTab();
- browser_->AddTabWithURL(url, GURL(), transition,
- true, index, true, NULL);
+ browser_->AddTabWithURL(url, GURL(), transition, index,
+ Browser::ADD_SELECTED | Browser::ADD_FORCE_INDEX,
+ NULL, std::string());
break;
}
case chromeos::StatusAreaView::OPEN_TABS_CLOBBER: {
@@ -402,11 +403,15 @@ void AppLauncher::AddTabWithURL(const GURL& url,
break;
}
case chromeos::StatusAreaView::OPEN_TABS_ON_RIGHT: {
- browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
+ browser_->AddTabWithURL(url, GURL(), transition, -1,
+ Browser::ADD_SELECTED | Browser::ADD_FORCE_INDEX,
+ NULL, std::string());
break;
}
}
#else
- browser_->AddTabWithURL(url, GURL(), transition, true, -1, true, NULL);
+ browser_->AddTabWithURL(url, GURL(), transition, -1,
+ Browser::ADD_SELECTED | Browser::ADD_FORCE_INDEX,
+ NULL, std::string());
#endif
}
diff --git a/chrome/browser/views/find_bar_host_interactive_uitest.cc b/chrome/browser/views/find_bar_host_interactive_uitest.cc
index e0819e6..f4e9b27 100644
--- a/chrome/browser/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/views/find_bar_host_interactive_uitest.cc
@@ -92,8 +92,8 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
browser()->Find();
// Open another tab (tab B).
- browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, true, -1,
- false, NULL);
+ browser()->AddTabWithURL(url, GURL(), PageTransition::TYPED, -1,
+ Browser::ADD_SELECTED, NULL, std::string());
browser()->Find();
EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, GetFocusedViewID());