Commit 4eea4ca1 authored by Connie Wan's avatar Connie Wan Committed by Commit Bot

Remove unused activeness arg from InsertTab methods

This was left hanging here: https://chromium-review.googlesource.com/c/chromium/src/+/1717271/7/chrome/browser/ui/views/tabs/tab_strip_layout_helper.cc

Bug: 966627
Change-Id: I162ee3a5e0f575fd3b180befbf296b7335f1cdbc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1761290Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Commit-Queue: Connie Wan <connily@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688521}
parent fdd17e21
...@@ -999,20 +999,17 @@ void TabStrip::AddTabAt(int model_index, TabRendererData data, bool is_active) { ...@@ -999,20 +999,17 @@ void TabStrip::AddTabAt(int model_index, TabRendererData data, bool is_active) {
// Don't animate the first tab, it looks weird, and don't animate anything // Don't animate the first tab, it looks weird, and don't animate anything
// if the containing window isn't visible yet. // if the containing window isn't visible yet.
TabAnimationState::TabActiveness activeness =
is_active ? TabAnimationState::TabActiveness::kActive
: TabAnimationState::TabActiveness::kInactive;
TabAnimationState::TabPinnedness pinnedness = TabAnimationState::TabPinnedness pinnedness =
pinned ? TabAnimationState::TabPinnedness::kPinned pinned ? TabAnimationState::TabPinnedness::kPinned
: TabAnimationState::TabPinnedness::kUnpinned; : TabAnimationState::TabPinnedness::kUnpinned;
if (tab_count() > 1 && GetWidget() && GetWidget()->IsVisible()) { if (tab_count() > 1 && GetWidget() && GetWidget()->IsVisible()) {
StartInsertTabAnimation(model_index, activeness, pinnedness); StartInsertTabAnimation(model_index, pinnedness);
} else { } else {
layout_helper_->InsertTabAtNoAnimation( layout_helper_->InsertTabAtNoAnimation(
model_index, tab, model_index, tab,
base::BindOnce(&TabStrip::OnTabCloseAnimationCompleted, base::BindOnce(&TabStrip::OnTabCloseAnimationCompleted,
base::Unretained(this), base::Unretained(tab)), base::Unretained(this), base::Unretained(tab)),
activeness, pinnedness); pinnedness);
CompleteAnimationAndLayout(); CompleteAnimationAndLayout();
} }
...@@ -2077,7 +2074,6 @@ std::map<TabGroupId, TabGroupHeader*> TabStrip::GetGroupHeaders() { ...@@ -2077,7 +2074,6 @@ std::map<TabGroupId, TabGroupHeader*> TabStrip::GetGroupHeaders() {
void TabStrip::StartInsertTabAnimation( void TabStrip::StartInsertTabAnimation(
int model_index, int model_index,
TabAnimationState::TabActiveness activeness,
TabAnimationState::TabPinnedness pinnedness) { TabAnimationState::TabPinnedness pinnedness) {
if (!bounds_animator_.IsAnimating() && !in_tab_close_) { if (!bounds_animator_.IsAnimating() && !in_tab_close_) {
layout_helper_->InsertTabAt( layout_helper_->InsertTabAt(
...@@ -2085,7 +2081,7 @@ void TabStrip::StartInsertTabAnimation( ...@@ -2085,7 +2081,7 @@ void TabStrip::StartInsertTabAnimation(
base::BindOnce(&TabStrip::OnTabCloseAnimationCompleted, base::BindOnce(&TabStrip::OnTabCloseAnimationCompleted,
base::Unretained(this), base::Unretained(this),
base::Unretained(tab_at(model_index))), base::Unretained(tab_at(model_index))),
activeness, pinnedness); pinnedness);
} else { } else {
// TODO(958173): Delete this branch once |TabStripLayoutHelper::animator_| // TODO(958173): Delete this branch once |TabStripLayoutHelper::animator_|
// has taken over all animation responsibilities. // has taken over all animation responsibilities.
...@@ -2094,7 +2090,7 @@ void TabStrip::StartInsertTabAnimation( ...@@ -2094,7 +2090,7 @@ void TabStrip::StartInsertTabAnimation(
base::BindOnce(&TabStrip::OnTabCloseAnimationCompleted, base::BindOnce(&TabStrip::OnTabCloseAnimationCompleted,
base::Unretained(this), base::Unretained(this),
base::Unretained(tab_at(model_index))), base::Unretained(tab_at(model_index))),
activeness, pinnedness); pinnedness);
PrepareForAnimation(); PrepareForAnimation();
......
...@@ -347,7 +347,6 @@ class TabStrip : public views::AccessiblePaneView, ...@@ -347,7 +347,6 @@ class TabStrip : public views::AccessiblePaneView,
// Invoked from |AddTabAt| after the newly created tab has been inserted. // Invoked from |AddTabAt| after the newly created tab has been inserted.
void StartInsertTabAnimation(int model_index, void StartInsertTabAnimation(int model_index,
TabAnimationState::TabActiveness activeness,
TabAnimationState::TabPinnedness pinnedness); TabAnimationState::TabPinnedness pinnedness);
// Animates the removal of the tab at |model_index|. Defers to the old // Animates the removal of the tab at |model_index|. Defers to the old
......
...@@ -123,7 +123,6 @@ void TabStripLayoutHelper::InsertTabAtNoAnimation( ...@@ -123,7 +123,6 @@ void TabStripLayoutHelper::InsertTabAtNoAnimation(
int model_index, int model_index,
Tab* tab, Tab* tab,
base::OnceClosure tab_removed_callback, base::OnceClosure tab_removed_callback,
TabAnimationState::TabActiveness active,
TabAnimationState::TabPinnedness pinned) { TabAnimationState::TabPinnedness pinned) {
const int slot_index = GetSlotIndexForTabModelIndex(model_index); const int slot_index = GetSlotIndexForTabModelIndex(model_index);
slots_.insert( slots_.insert(
...@@ -136,7 +135,6 @@ void TabStripLayoutHelper::InsertTabAt( ...@@ -136,7 +135,6 @@ void TabStripLayoutHelper::InsertTabAt(
int model_index, int model_index,
Tab* tab, Tab* tab,
base::OnceClosure tab_removed_callback, base::OnceClosure tab_removed_callback,
TabAnimationState::TabActiveness active,
TabAnimationState::TabPinnedness pinned) { TabAnimationState::TabPinnedness pinned) {
const int slot_index = GetSlotIndexForTabModelIndex(model_index); const int slot_index = GetSlotIndexForTabModelIndex(model_index);
slots_.insert( slots_.insert(
......
...@@ -57,7 +57,6 @@ class TabStripLayoutHelper { ...@@ -57,7 +57,6 @@ class TabStripLayoutHelper {
void InsertTabAtNoAnimation(int model_index, void InsertTabAtNoAnimation(int model_index,
Tab* tab, Tab* tab,
base::OnceClosure tab_removed_callback, base::OnceClosure tab_removed_callback,
TabAnimationState::TabActiveness active,
TabAnimationState::TabPinnedness pinned); TabAnimationState::TabPinnedness pinned);
// Inserts a new tab at |index|, with animation. |tab_removed_callback| will // Inserts a new tab at |index|, with animation. |tab_removed_callback| will
...@@ -65,7 +64,6 @@ class TabStripLayoutHelper { ...@@ -65,7 +64,6 @@ class TabStripLayoutHelper {
void InsertTabAt(int model_index, void InsertTabAt(int model_index,
Tab* tab, Tab* tab,
base::OnceClosure tab_removed_callback, base::OnceClosure tab_removed_callback,
TabAnimationState::TabActiveness active,
TabAnimationState::TabPinnedness pinned); TabAnimationState::TabPinnedness pinned);
// Marks the tab at |model_index| as closed without animating it. Use when // Marks the tab at |model_index| as closed without animating it. Use when
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment