summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r--chrome/browser/ui/browser.cc26
-rw-r--r--chrome/browser/ui/browser.h2
-rw-r--r--chrome/browser/ui/browser_init.cc2
-rw-r--r--chrome/browser/ui/browser_navigator.cc14
-rw-r--r--chrome/browser/ui/browser_navigator.h6
-rw-r--r--chrome/browser/ui/cocoa/applescript/window_applescript.mm2
-rw-r--r--chrome/browser/ui/cocoa/tabpose_window.mm4
-rw-r--r--chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm10
-rw-r--r--chrome/browser/ui/find_bar/find_bar_host_browsertest.cc8
-rw-r--r--chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk_interactive_uitest.cc2
-rw-r--r--chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc6
-rw-r--r--chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc2
-rw-r--r--chrome/browser/ui/views/find_bar_host_interactive_uitest.cc8
-rw-r--r--chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc6
-rw-r--r--chrome/browser/ui/webui/bug_report_ui.cc2
15 files changed, 50 insertions, 50 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index ffff262..19610885 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -637,7 +637,7 @@ TabContents* Browser::OpenApplicationTab(Profile* profile,
extensions_service->extension_prefs()->GetLaunchType(
extension->id(), ExtensionPrefs::LAUNCH_DEFAULT);
UMA_HISTOGRAM_ENUMERATION("Extensions.AppTabLaunchType", launch_type, 100);
- int add_type = TabStripModel::ADD_SELECTED;
+ int add_type = TabStripModel::ADD_ACTIVE;
if (launch_type == ExtensionPrefs::LAUNCH_PINNED)
add_type |= TabStripModel::ADD_PINNED;
@@ -666,8 +666,8 @@ TabContents* Browser::OpenApplicationTab(Profile* profile,
model->SetTabPinned(tab_index, true);
tab_index = model->GetWrapperIndex(existing_tab);
}
- if (params.tabstrip_add_types & TabStripModel::ADD_SELECTED)
- model->SelectTabContentsAt(tab_index, true);
+ if (params.tabstrip_add_types & TabStripModel::ADD_ACTIVE)
+ model->ActivateTabAt(tab_index, true);
contents = existing_tab;
} else {
@@ -987,8 +987,8 @@ TabContents* Browser::GetTabContentsAt(int index) const {
return NULL;
}
-void Browser::SelectTabContentsAt(int index, bool user_gesture) {
- tab_handler_->GetTabStripModel()->SelectTabContentsAt(index, user_gesture);
+void Browser::ActivateTabAt(int index, bool user_gesture) {
+ tab_handler_->GetTabStripModel()->ActivateTabAt(index, user_gesture);
}
bool Browser::IsTabPinned(int index) const {
@@ -1022,7 +1022,7 @@ TabContentsWrapper* Browser::AddSelectedTabWithURL(const GURL& url,
TabContents* Browser::AddTab(TabContentsWrapper* tab_contents,
PageTransition::Type type) {
tab_handler_->GetTabStripModel()->AddTabContents(
- tab_contents, -1, type, TabStripModel::ADD_SELECTED);
+ tab_contents, -1, type, TabStripModel::ADD_ACTIVE);
return tab_contents->tab_contents();
}
@@ -1068,7 +1068,7 @@ TabContents* Browser::AddRestoredTab(
new_tab->controller().RestoreFromState(navigations, selected_navigation,
from_last_session);
- int add_types = select ? TabStripModel::ADD_SELECTED :
+ int add_types = select ? TabStripModel::ADD_ACTIVE :
TabStripModel::ADD_NONE;
if (pin) {
tab_index = std::min(tab_index, tabstrip_model()->IndexOfFirstNonMiniTab());
@@ -1211,7 +1211,7 @@ TabContents* Browser::GetOrCloneTabForDisposition(
current_tab = current_tab->Clone();
tab_handler_->GetTabStripModel()->AddTabContents(
current_tab, -1, PageTransition::LINK,
- disposition == NEW_FOREGROUND_TAB ? TabStripModel::ADD_SELECTED :
+ disposition == NEW_FOREGROUND_TAB ? TabStripModel::ADD_ACTIVE :
TabStripModel::ADD_NONE);
}
return current_tab->tab_contents();
@@ -1470,7 +1470,7 @@ void Browser::SelectNumberedTab(int index) {
if (index < tab_count()) {
UserMetrics::RecordAction(UserMetricsAction("SelectNumberedTab"),
profile_);
- tab_handler_->GetTabStripModel()->SelectTabContentsAt(index, true);
+ tab_handler_->GetTabStripModel()->ActivateTabAt(index, true);
}
}
@@ -2562,7 +2562,7 @@ void Browser::DuplicateContentsAt(int index) {
int index = tab_handler_->GetTabStripModel()->
GetIndexOfTabContents(contents);
pinned = tab_handler_->GetTabStripModel()->IsTabPinned(index);
- int add_types = TabStripModel::ADD_SELECTED |
+ int add_types = TabStripModel::ADD_ACTIVE |
TabStripModel::ADD_INHERIT_GROUP |
(pinned ? TabStripModel::ADD_PINNED : 0);
tab_handler_->GetTabStripModel()->InsertTabContentsAt(index + 1,
@@ -2932,7 +2932,7 @@ void Browser::AddNewContents(TabContents* source,
}
void Browser::ActivateContents(TabContents* contents) {
- tab_handler_->GetTabStripModel()->SelectTabContentsAt(
+ tab_handler_->GetTabStripModel()->ActivateTabAt(
tab_handler_->GetTabStripModel()->GetWrapperIndex(contents), false);
window_->Activate();
}
@@ -4336,7 +4336,7 @@ bool Browser::OpenInstant(WindowOpenDisposition disposition) {
preview_contents,
-1,
instant()->last_transition_type(),
- TabStripModel::ADD_SELECTED);
+ TabStripModel::ADD_ACTIVE);
instant()->CompleteRelease(preview_contents->tab_contents());
return true;
}
@@ -4395,7 +4395,7 @@ void Browser::ViewSource(TabContentsWrapper* contents,
// window next to the tab being duplicated.
int index = tab_handler_->GetTabStripModel()->
GetIndexOfTabContents(contents);
- int add_types = TabStripModel::ADD_SELECTED |
+ int add_types = TabStripModel::ADD_ACTIVE |
TabStripModel::ADD_INHERIT_GROUP;
tab_handler_->GetTabStripModel()->InsertTabContentsAt(index + 1,
view_source_contents,
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index dd45710..dbea23e 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -353,7 +353,7 @@ class Browser : public TabHandlerDelegate,
// this differs from the TabStripModel because it has far fewer clients.
TabContents* GetSelectedTabContents() const;
TabContents* GetTabContentsAt(int index) const;
- void SelectTabContentsAt(int index, bool user_gesture);
+ void ActivateTabAt(int index, bool user_gesture);
bool IsTabPinned(int index) const;
void CloseAllTabs();
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index 7f0c1a4..7f94444 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -1004,7 +1004,7 @@ Browser* BrowserInit::LaunchWithProfile::OpenTabsInBrowser(
if (!process_startup && !net::URLRequest::IsHandledURL(tabs[i].url))
continue;
- int add_types = first_tab ? TabStripModel::ADD_SELECTED :
+ int add_types = first_tab ? TabStripModel::ADD_ACTIVE :
TabStripModel::ADD_NONE;
add_types |= TabStripModel::ADD_FORCE_INDEX;
if (tabs[i].is_pinned)
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc
index a893e41..cee32a8 100644
--- a/chrome/browser/ui/browser_navigator.cc
+++ b/chrome/browser/ui/browser_navigator.cc
@@ -235,10 +235,10 @@ void NormalizeDisposition(browser::NavigateParams* params) {
switch (params->disposition) {
case NEW_BACKGROUND_TAB:
- // Disposition trumps add types. ADD_SELECTED is a default, so we need to
+ // Disposition trumps add types. ADD_ACTIVE is a default, so we need to
// remove it if disposition implies the tab is going to open in the
// background.
- params->tabstrip_add_types &= ~TabStripModel::ADD_SELECTED;
+ params->tabstrip_add_types &= ~TabStripModel::ADD_ACTIVE;
break;
case NEW_WINDOW:
@@ -250,7 +250,7 @@ void NormalizeDisposition(browser::NavigateParams* params) {
// Fall-through.
case NEW_FOREGROUND_TAB:
case SINGLETON_TAB:
- params->tabstrip_add_types |= TabStripModel::ADD_SELECTED;
+ params->tabstrip_add_types |= TabStripModel::ADD_ACTIVE;
break;
default:
@@ -344,7 +344,7 @@ NavigateParams::NavigateParams(
disposition(CURRENT_TAB),
transition(a_transition),
tabstrip_index(-1),
- tabstrip_add_types(TabStripModel::ADD_SELECTED),
+ tabstrip_add_types(TabStripModel::ADD_ACTIVE),
window_action(NO_ACTION),
path_behavior(RESPECT),
browser(a_browser),
@@ -358,7 +358,7 @@ NavigateParams::NavigateParams(Browser* a_browser,
disposition(CURRENT_TAB),
transition(PageTransition::LINK),
tabstrip_index(-1),
- tabstrip_add_types(TabStripModel::ADD_SELECTED),
+ tabstrip_add_types(TabStripModel::ADD_ACTIVE),
window_action(NO_ACTION),
path_behavior(RESPECT),
browser(a_browser),
@@ -435,7 +435,7 @@ void Navigate(NavigateParams* params) {
// failures in startup tests.
// By default, content believes it is not hidden. When adding contents
// in the background, tell it that it's hidden.
- if ((params->tabstrip_add_types & TabStripModel::ADD_SELECTED) == 0) {
+ if ((params->tabstrip_add_types & TabStripModel::ADD_ACTIVE) == 0) {
// TabStripModel::AddTabContents invokes HideContents if not foreground.
params->target_contents->tab_contents()->WasHidden();
}
@@ -494,7 +494,7 @@ void Navigate(NavigateParams* params) {
// If the singleton tab isn't already selected, select it.
if (params->source_contents != params->target_contents)
- params->browser->SelectTabContentsAt(singleton_index, user_initiated);
+ params->browser->ActivateTabAt(singleton_index, user_initiated);
}
}
diff --git a/chrome/browser/ui/browser_navigator.h b/chrome/browser/ui/browser_navigator.h
index 3ab9bca..d93930d 100644
--- a/chrome/browser/ui/browser_navigator.h
+++ b/chrome/browser/ui/browser_navigator.h
@@ -83,10 +83,10 @@ struct NavigateParams {
// CURRENT_TAB " " " NEW_FOREGROUND_TAB
// OFF_THE_RECORD target browser profile is incog. NEW_FOREGROUND_TAB
//
- // If disposition is NEW_BACKGROUND_TAB, TabStripModel::ADD_SELECTED is
+ // If disposition is NEW_BACKGROUND_TAB, TabStripModel::ADD_ACTIVE is
// removed from |tabstrip_add_types| automatically.
// If disposition is one of NEW_WINDOW, NEW_POPUP, NEW_FOREGROUND_TAB or
- // SINGLETON_TAB, then TabStripModel::ADD_SELECTED is automatically added to
+ // SINGLETON_TAB, then TabStripModel::ADD_ACTIVE is automatically added to
// |tabstrip_add_types|.
WindowOpenDisposition disposition;
@@ -102,7 +102,7 @@ struct NavigateParams {
// A bitmask of values defined in TabStripModel::AddTabTypes. Helps
// determine where to insert a new tab and whether or not it should be
- // selected, among other properties. Default is ADD_SELECTED.
+ // selected, among other properties. Default is ADD_ACTIVE.
int tabstrip_add_types;
// If non-empty, the new tab is an app tab.
diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
index 465e2f7..491cc8d 100644
--- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
@@ -116,7 +116,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_->SelectTabContentsAt(atIndex, true);
+ browser_->ActivateTabAt(atIndex, true);
else
AppleScript::SetError(AppleScript::errInvalidTabIndex);
}
diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm
index d821c76..4a0d7fd 100644
--- a/chrome/browser/ui/cocoa/tabpose_window.mm
+++ b/chrome/browser/ui/cocoa/tabpose_window.mm
@@ -1446,8 +1446,8 @@ void AnimateCALayerOpacityFromTo(
// Select chosen tab.
if (tileSet_->selected_index() < tabStripModel_->count()) {
- tabStripModel_->SelectTabContentsAt(tileSet_->selected_index(),
- /*user_gesture=*/true);
+ tabStripModel_->ActivateTabAt(tileSet_->selected_index(),
+ /*user_gesture=*/true);
} else {
DCHECK_EQ(tileSet_->selected_index(), 0);
}
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
index e8d6442..32c97df 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
@@ -698,7 +698,7 @@ class NotificationBridge : public NotificationObserver {
DCHECK([sender isKindOfClass:[NSView class]]);
int index = [self modelIndexForTabView:sender];
if (tabStripModel_->ContainsIndex(index))
- tabStripModel_->SelectTabContentsAt(index, true);
+ tabStripModel_->ActivateTabAt(index, true);
}
// Called when the user closes a tab. Asks the model to close the tab. |sender|
@@ -1606,7 +1606,7 @@ class NotificationBridge : public NotificationObserver {
// inherit the current tab's group.
tabStripModel_->InsertTabContentsAt(
modelIndex, contents,
- TabStripModel::ADD_SELECTED | (pinned ? TabStripModel::ADD_PINNED : 0));
+ TabStripModel::ADD_ACTIVE | (pinned ? TabStripModel::ADD_PINNED : 0));
}
// Called when the tab strip view changes size. As we only registered for
@@ -1852,7 +1852,7 @@ class NotificationBridge : public NotificationObserver {
params.disposition = disposition;
params.tabstrip_index = index;
params.tabstrip_add_types =
- TabStripModel::ADD_SELECTED | TabStripModel::ADD_FORCE_INDEX;
+ TabStripModel::ADD_ACTIVE | TabStripModel::ADD_FORCE_INDEX;
browser::Navigate(&params);
break;
}
@@ -1862,7 +1862,7 @@ class NotificationBridge : public NotificationObserver {
tabStripModel_->GetTabContentsAt(index)
->tab_contents()->OpenURL(*url, GURL(), CURRENT_TAB,
PageTransition::TYPED);
- tabStripModel_->SelectTabContentsAt(index, true);
+ tabStripModel_->ActivateTabAt(index, true);
break;
default:
NOTIMPLEMENTED();
@@ -1995,7 +1995,7 @@ class NotificationBridge : public NotificationObserver {
NSInteger index = [self modelIndexForContentsView:view];
DCHECK(index >= 0);
if (index >= 0)
- tabStripModel_->SelectTabContentsAt(index, false /* not a user gesture */);
+ tabStripModel_->ActivateTabAt(index, false /* not a user gesture */);
}
- (void)attachConstrainedWindow:(ConstrainedWindowMac*)window {
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 91d3a3ff..a34b0c5 100644
--- a/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
+++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc
@@ -843,7 +843,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) {
params.disposition = NEW_BACKGROUND_TAB;
params.tabstrip_add_types = TabStripModel::ADD_NONE;
browser::Navigate(&params);
- browser()->SelectTabContentsAt(1, false);
+ browser()->ActivateTabAt(1, false);
TabContentsWrapper* tab2 = browser()->GetSelectedTabContentsWrapper();
EXPECT_NE(tab1, tab2);
@@ -851,7 +851,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PreferPreviousSearch) {
FindInPageWchar(tab2, L"given", kFwd, kIgnoreCase, &ordinal);
// Switch back to first tab.
- browser()->SelectTabContentsAt(0, false);
+ browser()->ActivateTabAt(0, false);
browser()->GetFindBarController()->EndFindSession(
FindBarController::kKeepSelection);
// Simulate F3.
@@ -967,7 +967,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, PrepopulatePreserveLast) {
params.disposition = NEW_BACKGROUND_TAB;
params.tabstrip_add_types = TabStripModel::ADD_NONE;
browser::Navigate(&params);
- browser()->SelectTabContentsAt(1, false);
+ browser()->ActivateTabAt(1, false);
TabContentsWrapper* tab2 = browser()->GetSelectedTabContentsWrapper();
EXPECT_NE(tab1, tab2);
@@ -976,7 +976,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()->SelectTabContentsAt(0, false);
+ browser()->ActivateTabAt(0, false);
// Open the Find box.
EnsureFindBoxOpen();
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 870cc11..d62d495 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
@@ -39,7 +39,7 @@ IN_PROC_BROWSER_TEST_F(BookmarkBarGtkInteractiveUITest, FindBarTest) {
browser()->AddSelectedTabWithURL(url, PageTransition::TYPED);
// Switch back to the NTP with the active findbar.
- browser()->SelectTabContentsAt(1, false);
+ browser()->ActivateTabAt(1, false);
// Wait for the findbar to show.
MessageLoop::current()->RunAllPending();
diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
index e3e40cf..051177d 100644
--- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
@@ -393,7 +393,7 @@ void DraggedTabControllerGtk::Attach(TabStripGtk* attached_tabstrip,
int index = GetInsertionIndexForDraggedBounds(bounds, false);
attached_tabstrip_->model()->InsertTabContentsAt(
index, dragged_contents_,
- TabStripModel::ADD_SELECTED |
+ TabStripModel::ADD_ACTIVE |
(pinned_ ? TabStripModel::ADD_PINNED : 0));
tab = GetTabMatchingDraggedContents(attached_tabstrip_);
@@ -624,7 +624,7 @@ void DraggedTabControllerGtk::RevertDrag() {
attached_tabstrip_ = source_tabstrip_;
source_tabstrip_->model()->InsertTabContentsAt(
source_model_index_, dragged_contents_,
- TabStripModel::ADD_SELECTED |
+ TabStripModel::ADD_ACTIVE |
(pinned_ ? TabStripModel::ADD_PINNED : 0));
} else {
// The tab was moved within the tabstrip where the drag was initiated.
@@ -641,7 +641,7 @@ void DraggedTabControllerGtk::RevertDrag() {
// source tabstrip.
source_tabstrip_->model()->InsertTabContentsAt(
source_model_index_, dragged_contents_,
- TabStripModel::ADD_SELECTED |
+ TabStripModel::ADD_ACTIVE |
(pinned_ ? TabStripModel::ADD_PINNED : 0));
}
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index be5406b..d5241cd 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -1121,7 +1121,7 @@ bool TabStripGtk::IsTabPinned(const TabGtk* tab) const {
void TabStripGtk::SelectTab(TabGtk* tab) {
int index = GetIndexOfTab(tab);
if (model_->ContainsIndex(index))
- model_->SelectTabContentsAt(index, true);
+ model_->ActivateTabAt(index, true);
}
void TabStripGtk::CloseTab(TabGtk* tab) {
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 e030d8c..8b6ea35 100644
--- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
+++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -58,7 +58,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, CrashEscHandlers) {
VIEW_ID_FIND_IN_PAGE_TEXT_FIELD));
// Select tab A.
- browser()->SelectTabContentsAt(0, true);
+ browser()->ActivateTabAt(0, true);
// Close tab B.
browser()->CloseTabContents(browser()->GetTabContentsAt(1));
@@ -158,13 +158,13 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestoreOnTabSwitch) {
EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
// Select tab A. Find bar should get focus.
- browser()->SelectTabContentsAt(0, true);
+ browser()->ActivateTabAt(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()->SelectTabContentsAt(1, true);
+ browser()->ActivateTabAt(1, true);
EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_LOCATION_BAR));
}
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 650fc3b..6c4542e 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -215,7 +215,7 @@ bool BrowserTabStripController::IsNewTabPage(int model_index) const {
}
void BrowserTabStripController::SelectTab(int model_index) {
- model_->SelectTabContentsAt(model_index, true);
+ model_->ActivateTabAt(model_index, true);
}
void BrowserTabStripController::ExtendSelectionTo(int model_index) {
@@ -274,14 +274,14 @@ void BrowserTabStripController::PerformDrop(bool drop_before,
TabContentsWrapper* contents = model_->delegate()->CreateTabContentsForURL(
url, GURL(), model_->profile(), PageTransition::TYPED, false, NULL);
model_->AddTabContents(contents, index, PageTransition::GENERATED,
- TabStripModel::ADD_SELECTED);
+ TabStripModel::ADD_ACTIVE);
} else {
UserMetrics::RecordAction(UserMetricsAction("Tab_DropURLOnTab"),
model_->profile());
model_->GetTabContentsAt(index)->controller().LoadURL(
url, GURL(), PageTransition::GENERATED);
- model_->SelectTabContentsAt(index, true);
+ model_->ActivateTabAt(index, true);
}
}
diff --git a/chrome/browser/ui/webui/bug_report_ui.cc b/chrome/browser/ui/webui/bug_report_ui.cc
index 53ab28c..0aae439 100644
--- a/chrome/browser/ui/webui/bug_report_ui.cc
+++ b/chrome/browser/ui/webui/bug_report_ui.cc
@@ -150,7 +150,7 @@ void ShowHtmlBugReportView(Browser* browser) {
int feedback_tab_index = GetIndexOfFeedbackTab(browser);
if (feedback_tab_index >=0) {
// Do not refresh screenshot, do not create a new tab
- browser->SelectTabContentsAt(feedback_tab_index, true);
+ browser->ActivateTabAt(feedback_tab_index, true);
return;
}
generated by cgit v1.1 at 2025-02-19 11:50:06 +0000