| Index: chrome/browser/tabs/tab_strip_model.cc
|
| diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
|
| index d1ded2fb870b424509045ebb4b63ded573a3a98a..377e60690e33ace9300ac64b22dc8936c7dec650 100644
|
| --- a/chrome/browser/tabs/tab_strip_model.cc
|
| +++ b/chrome/browser/tabs/tab_strip_model.cc
|
| @@ -182,8 +182,8 @@ TabContentsWrapper* TabStripModel::ReplaceTabContentsAt(
|
| // selected contents as selection changing.
|
| if (active_index() == index) {
|
| FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
|
| - TabSelectedAt(old_contents, new_contents, active_index(),
|
| - false));
|
| + TabActivatedAt(old_contents, new_contents, active_index(),
|
| + false));
|
| }
|
| return old_contents;
|
| }
|
| @@ -254,8 +254,8 @@ void TabStripModel::ActivateTabAt(int index, bool user_gesture) {
|
| }
|
| if (old_contents != new_contents || had_multi) {
|
| FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
|
| - TabSelectedAt(old_contents, new_contents,
|
| - active_index(), user_gesture));
|
| + TabActivatedAt(old_contents, new_contents,
|
| + active_index(), user_gesture));
|
| }
|
| }
|
|
|
| @@ -1220,8 +1220,8 @@ void TabStripModel::NotifyTabSelectedIfChanged(TabContentsWrapper* old_contents,
|
| }
|
|
|
| FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
|
| - TabSelectedAt(last_selected_contents, new_contents,
|
| - active_index(), user_gesture));
|
| + TabActivatedAt(last_selected_contents, new_contents,
|
| + active_index(), user_gesture));
|
| }
|
|
|
| void TabStripModel::NotifySelectionChanged(int old_selected_index) {
|
| @@ -1232,7 +1232,7 @@ void TabStripModel::NotifySelectionChanged(int old_selected_index) {
|
| active_index() == TabStripSelectionModel::kUnselectedIndex ?
|
| NULL : GetTabContentsAt(active_index());
|
| FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
|
| - TabSelectedAt(old_tab, new_tab, active_index(), true));
|
| + TabActivatedAt(old_tab, new_tab, active_index(), true));
|
| }
|
|
|
| void TabStripModel::SelectRelativeTab(bool next) {
|
|
|