Commit 0fbe1e52 authored by sangwoo.ko's avatar sangwoo.ko Committed by Commit Bot

Use TabStripModelObserver's new API: trivial files 1/2

Replace old API with new API. This CL is a refactor
and has no intended behavior change.

Bug: 842194
Change-Id: I0d635e46bbaf3f9cfb7d5083445319c341c0cb76
Reviewed-on: https://chromium-review.googlesource.com/c/1245861Reviewed-by: default avatarScott Violet <sky@chromium.org>
Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Commit-Queue: Sang Woo Ko <sangwoo108@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599700}
parent f0860cf6
...@@ -184,14 +184,21 @@ int CountRenderProcessHosts() { ...@@ -184,14 +184,21 @@ int CountRenderProcessHosts() {
return result; return result;
} }
class MockTabStripModelObserver : public TabStripModelObserver { class TabClosingObserver : public TabStripModelObserver {
public: public:
MockTabStripModelObserver() : closing_count_(0) {} TabClosingObserver() : closing_count_(0) {}
void TabClosingAt(TabStripModel* tab_strip_model, void OnTabStripModelChanged(
WebContents* contents, TabStripModel* tab_strip_model,
int index) override { const TabStripModelChange& change,
++closing_count_; const TabStripSelectionChange& selection) override {
if (change.type() != TabStripModelChange::kRemoved)
return;
for (const auto& delta : change.deltas()) {
if (delta.remove.will_be_deleted)
++closing_count_;
}
} }
int closing_count() const { return closing_count_; } int closing_count() const { return closing_count_; }
...@@ -199,7 +206,7 @@ class MockTabStripModelObserver : public TabStripModelObserver { ...@@ -199,7 +206,7 @@ class MockTabStripModelObserver : public TabStripModelObserver {
private: private:
int closing_count_; int closing_count_;
DISALLOW_COPY_AND_ASSIGN(MockTabStripModelObserver); DISALLOW_COPY_AND_ASSIGN(TabClosingObserver);
}; };
// Used by CloseWithAppMenuOpen. Invokes CloseWindow on the supplied browser. // Used by CloseWithAppMenuOpen. Invokes CloseWindow on the supplied browser.
...@@ -1157,7 +1164,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TabClosingWhenRemovingExtension) { ...@@ -1157,7 +1164,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_TabClosingWhenRemovingExtension) {
model->SetTabPinned(0, true); model->SetTabPinned(0, true);
ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::NavigateToURL(browser(), url);
MockTabStripModelObserver observer; TabClosingObserver observer;
model->AddObserver(&observer); model->AddObserver(&observer);
// Uninstall the extension and make sure TabClosing is sent. // Uninstall the extension and make sure TabClosing is sent.
......
...@@ -140,15 +140,14 @@ class WindowActivityWatcher::BrowserWatcher : public TabStripModelObserver { ...@@ -140,15 +140,14 @@ class WindowActivityWatcher::BrowserWatcher : public TabStripModelObserver {
private: private:
// TabStripModelObserver: // TabStripModelObserver:
void TabInsertedAt(TabStripModel* tab_strip_model, void OnTabStripModelChanged(
content::WebContents* contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
bool foreground) override { const TabStripSelectionChange& selection) override {
MaybeLogWindowMetricsUkmEntry(); if (change.type() != TabStripModelChange::kInserted &&
} change.type() != TabStripModelChange::kRemoved)
void TabDetachedAt(content::WebContents* contents, return;
int index,
bool was_active) override {
MaybeLogWindowMetricsUkmEntry(); MaybeLogWindowMetricsUkmEntry();
} }
......
...@@ -669,20 +669,18 @@ bool AppMenuModel::GetAcceleratorForCommandId( ...@@ -669,20 +669,18 @@ bool AppMenuModel::GetAcceleratorForCommandId(
return provider_->GetAcceleratorForCommandId(command_id, accelerator); return provider_->GetAcceleratorForCommandId(command_id, accelerator);
} }
void AppMenuModel::ActiveTabChanged(WebContents* old_contents, void AppMenuModel::OnTabStripModelChanged(
WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) { const TabStripSelectionChange& selection) {
// The user has switched between tabs and the new tab may have a different if (tab_strip_model->empty())
// zoom setting. return;
UpdateZoomControls();
}
void AppMenuModel::TabReplacedAt(TabStripModel* tab_strip_model, if (selection.active_tab_changed()) {
WebContents* old_contents, // The user has switched between tabs and the new tab may have a different
WebContents* new_contents, // zoom setting. Or web contents for a tab has been replaced.
int index) { UpdateZoomControls();
UpdateZoomControls(); }
} }
void AppMenuModel::Observe(int type, void AppMenuModel::Observe(int type,
......
...@@ -136,14 +136,10 @@ class AppMenuModel : public ui::SimpleMenuModel, ...@@ -136,14 +136,10 @@ class AppMenuModel : public ui::SimpleMenuModel,
ui::Accelerator* accelerator) const override; ui::Accelerator* accelerator) const override;
// Overridden from TabStripModelObserver: // Overridden from TabStripModelObserver:
void ActiveTabChanged(content::WebContents* old_contents, void OnTabStripModelChanged(
content::WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) override; const TabStripSelectionChange& selection) override;
void TabReplacedAt(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents,
int index) override;
// Overridden from content::NotificationObserver: // Overridden from content::NotificationObserver:
void Observe(int type, void Observe(int type,
......
...@@ -221,10 +221,13 @@ void MediaRouterAction::OnRoutesUpdated( ...@@ -221,10 +221,13 @@ void MediaRouterAction::OnRoutesUpdated(
MaybeUpdateIcon(); MaybeUpdateIcon();
} }
void MediaRouterAction::ActiveTabChanged(content::WebContents* old_contents, void MediaRouterAction::OnTabStripModelChanged(
content::WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) { const TabStripSelectionChange& selection) {
if (!selection.active_tab_changed() || tab_strip_model->empty())
return;
RegisterWithDialogController(); RegisterWithDialogController();
UpdateDialogState(); UpdateDialogState();
} }
......
...@@ -74,10 +74,10 @@ class MediaRouterAction : public ToolbarActionViewController, ...@@ -74,10 +74,10 @@ class MediaRouterAction : public ToolbarActionViewController,
joinable_route_ids) override; joinable_route_ids) override;
// ToolbarStripModelObserver: // ToolbarStripModelObserver:
void ActiveTabChanged(content::WebContents* old_contents, void OnTabStripModelChanged(
content::WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) override; const TabStripSelectionChange& selection) override;
// ToolbarActionsBarObserver: // ToolbarActionsBarObserver:
void OnToolbarActionsBarAnimationEnded() override; void OnToolbarActionsBarAnimationEnded() override;
......
...@@ -54,14 +54,14 @@ class TestMediaRouterAction : public MediaRouterAction { ...@@ -54,14 +54,14 @@ class TestMediaRouterAction : public MediaRouterAction {
~TestMediaRouterAction() override {} ~TestMediaRouterAction() override {}
// MediaRouterAction: // MediaRouterAction:
void ActiveTabChanged(content::WebContents* old_contents, void OnTabStripModelChanged(
content::WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) override { const TabStripSelectionChange& selection) override {
// This would be null if |controller_| hasn't been set. // This would be null if |controller_| hasn't been set.
if (GetMediaRouterDialogController()) { if (GetMediaRouterDialogController()) {
MediaRouterAction::ActiveTabChanged(old_contents, new_contents, index, MediaRouterAction::OnTabStripModelChanged(tab_strip_model, change,
reason); selection);
} }
} }
......
...@@ -769,12 +769,15 @@ void ToolbarActionsBar::OnToolbarModelInitialized() { ...@@ -769,12 +769,15 @@ void ToolbarActionsBar::OnToolbarModelInitialized() {
ResizeDelegate(gfx::Tween::EASE_OUT); ResizeDelegate(gfx::Tween::EASE_OUT);
} }
void ToolbarActionsBar::TabInsertedAt(TabStripModel* tab_strip_model, void ToolbarActionsBar::OnTabStripModelChanged(
content::WebContents* contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
bool foreground) { const TabStripSelectionChange& selection) {
if (foreground) if (tab_strip_model->empty() || !selection.active_tab_changed())
extensions::MaybeShowExtensionControlledNewTabPage(browser_, contents); return;
extensions::MaybeShowExtensionControlledNewTabPage(browser_,
selection.new_contents);
} }
void ToolbarActionsBar::ReorderActions() { void ToolbarActionsBar::ReorderActions() {
......
...@@ -283,10 +283,10 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer, ...@@ -283,10 +283,10 @@ class ToolbarActionsBar : public ToolbarActionsModel::Observer,
void OnToolbarModelInitialized() override; void OnToolbarModelInitialized() override;
// TabStripModelObserver: // TabStripModelObserver:
void TabInsertedAt(TabStripModel* tab_strip_model, void OnTabStripModelChanged(
content::WebContents* contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
bool foreground) override; const TabStripSelectionChange& selection) override;
// Resizes the delegate (if necessary) to the preferred size using the given // Resizes the delegate (if necessary) to the preferred size using the given
// |tween_type|. // |tween_type|.
......
...@@ -18,11 +18,13 @@ CloseBubbleOnTabActivationHelper::CloseBubbleOnTabActivationHelper( ...@@ -18,11 +18,13 @@ CloseBubbleOnTabActivationHelper::CloseBubbleOnTabActivationHelper(
CloseBubbleOnTabActivationHelper::~CloseBubbleOnTabActivationHelper() = default; CloseBubbleOnTabActivationHelper::~CloseBubbleOnTabActivationHelper() = default;
void CloseBubbleOnTabActivationHelper::ActiveTabChanged( void CloseBubbleOnTabActivationHelper::OnTabStripModelChanged(
content::WebContents* old_contents, TabStripModel* tab_strip_model,
content::WebContents* new_contents, const TabStripModelChange& change,
int index, const TabStripSelectionChange& selection) {
int reason) { if (tab_strip_model->empty() || !selection.active_tab_changed())
return;
if (owner_bubble_) { if (owner_bubble_) {
views::Widget* bubble_widget = owner_bubble_->GetWidget(); views::Widget* bubble_widget = owner_bubble_->GetWidget();
if (bubble_widget) if (bubble_widget)
......
...@@ -27,10 +27,10 @@ class CloseBubbleOnTabActivationHelper : public TabStripModelObserver { ...@@ -27,10 +27,10 @@ class CloseBubbleOnTabActivationHelper : public TabStripModelObserver {
~CloseBubbleOnTabActivationHelper() override; ~CloseBubbleOnTabActivationHelper() override;
// TabStripModelObserver: // TabStripModelObserver:
void ActiveTabChanged(content::WebContents* old_contents, void OnTabStripModelChanged(
content::WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) override; const TabStripSelectionChange& selection) override;
private: private:
views::BubbleDialogDelegateView* owner_bubble_; // weak, owns me. views::BubbleDialogDelegateView* owner_bubble_; // weak, owns me.
......
...@@ -158,10 +158,13 @@ void ExtensionPopup::OnWidgetActivationChanged(views::Widget* widget, ...@@ -158,10 +158,13 @@ void ExtensionPopup::OnWidgetActivationChanged(views::Widget* widget,
CloseUnlessUnderInspection(); CloseUnlessUnderInspection();
} }
void ExtensionPopup::ActiveTabChanged(content::WebContents* old_contents, void ExtensionPopup::OnTabStripModelChanged(
content::WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) { const TabStripSelectionChange& selection) {
if (tab_strip_model->empty() || !selection.active_tab_changed())
return;
GetWidget()->Close(); GetWidget()->Close();
} }
......
...@@ -79,10 +79,10 @@ class ExtensionPopup : public views::BubbleDialogDelegateView, ...@@ -79,10 +79,10 @@ class ExtensionPopup : public views::BubbleDialogDelegateView,
void OnWidgetActivationChanged(views::Widget* widget, bool active) override; void OnWidgetActivationChanged(views::Widget* widget, bool active) override;
// TabStripModelObserver overrides. // TabStripModelObserver overrides.
void ActiveTabChanged(content::WebContents* old_contents, void OnTabStripModelChanged(
content::WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) override; const TabStripSelectionChange& selection) override;
// The min/max height of popups. // The min/max height of popups.
static const int kMinWidth; static const int kMinWidth;
......
...@@ -153,10 +153,13 @@ void BrowserAppMenuButton::OnThemeChanged() { ...@@ -153,10 +153,13 @@ void BrowserAppMenuButton::OnThemeChanged() {
UpdateIcon(false); UpdateIcon(false);
} }
void BrowserAppMenuButton::TabInsertedAt(TabStripModel* tab_strip_model, void BrowserAppMenuButton::OnTabStripModelChanged(
content::WebContents* contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
bool foreground) { const TabStripSelectionChange& selection) {
if (change.type() != TabStripModelChange::kInserted)
return;
AnimateIconIfPossible(true); AnimateIconIfPossible(true);
} }
......
...@@ -55,10 +55,10 @@ class BrowserAppMenuButton : public AppMenuButton, ...@@ -55,10 +55,10 @@ class BrowserAppMenuButton : public AppMenuButton,
void OnThemeChanged() override; void OnThemeChanged() override;
// TabStripObserver: // TabStripObserver:
void TabInsertedAt(TabStripModel* tab_strip_model, void OnTabStripModelChanged(
content::WebContents* contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
bool foreground) override; const TabStripSelectionChange& selection) override;
// Updates the presentation according to |severity_| and the theme provider. // Updates the presentation according to |severity_| and the theme provider.
// If |should_animate| is true, the icon should animate. // If |should_animate| is true, the icon should animate.
......
...@@ -103,11 +103,14 @@ class WebUsbNotificationDelegate : public TabStripModelObserver, ...@@ -103,11 +103,14 @@ class WebUsbNotificationDelegate : public TabStripModelObserver,
browser_tab_strip_tracker_.Init(); browser_tab_strip_tracker_.Init();
} }
void ActiveTabChanged(content::WebContents* old_contents, void OnTabStripModelChanged(
content::WebContents* new_contents, TabStripModel* tab_strip_model,
int index, const TabStripModelChange& change,
int reason) override { const TabStripSelectionChange& selection) override {
if (new_contents->GetURL() == landing_page_) { if (tab_strip_model->empty() || !selection.active_tab_changed())
return;
if (selection.new_contents->GetURL() == landing_page_) {
// If the disposition is not already set, go ahead and set it. // If the disposition is not already set, go ahead and set it.
if (disposition_ == WEBUSB_NOTIFICATION_CLOSED) if (disposition_ == WEBUSB_NOTIFICATION_CLOSED)
disposition_ = WEBUSB_NOTIFICATION_CLOSED_MANUAL_NAVIGATION; disposition_ = WEBUSB_NOTIFICATION_CLOSED_MANUAL_NAVIGATION;
......
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