Skip to content

GitLab

T
tangled
Commit 9775aabe authored by sangwoo.ko's avatar sangwoo.ko Committed by Commit Bot
Browse files
Options

Deprecate old TabStripModelObserver API 

Stop notifying events via old api and replace old API with new API.
This CL is a refactor and has no intended behavior change.

Bug: 842194
Change-Id: I5e11e7323940acbbdc31bd73d599480c7312e8b9
Reviewed-on: https://chromium-review.googlesource.com/c/1314508
Commit-Queue: Sang Woo Ko <sangwoo108@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605584}
parent d9966951
Hide whitespace changes
Inline Side-by-side
Showing with 409 additions and 698 deletions
chrome/browser/captive_portal/captive_portal_browsertest.cc
View file @ 9775aabe
......@@ -521,10 +521,13 @@ class TabActivationWaiter : public TabStripModelObserver {
}
// TabStripModelObserver overrides.
void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) override {
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override {
if (tab_strip_model->empty() || !selection.active_tab_changed())
return;
number_of_unconsumed_active_tab_changes_++;
DCHECK_EQ(1, number_of_unconsumed_active_tab_changes_);
if (message_loop_runner_)
......
chrome/browser/chromeos/arc/intent_helper/intent_picker_controller.cc
View file @ 9775aabe
......@@ -19,10 +19,15 @@ IntentPickerController::~IntentPickerController() {
browser_->tab_strip_model()->RemoveObserver(this);
}
void IntentPickerController::TabSelectionChanged(
TabStripModel* model,
const ui::ListSelectionModel& old_model) {
ResetVisibility();
void IntentPickerController::OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) {
if (tab_strip_model->empty())
return;
if (selection.selection_changed())
ResetVisibility();
}
void IntentPickerController::ResetVisibility() {
......
chrome/browser/chromeos/arc/intent_helper/intent_picker_controller.h
View file @ 9775aabe
......@@ -9,8 +9,6 @@
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
class Browser;
class ListSelectionModel;
class TabStripModel;
namespace arc {
......@@ -23,8 +21,10 @@ class IntentPickerController : public TabStripModelObserver {
private:
// TabStripModelObserver:
void TabSelectionChanged(TabStripModel* model,
const ui::ListSelectionModel& old_model) override;
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override;
void ResetVisibility();
......
chrome/browser/ui/ash/launcher/browser_status_monitor.cc
View file @ 9775aabe
......@@ -136,61 +136,30 @@ void BrowserStatusMonitor::OnBrowserRemoved(Browser* browser) {
UpdateBrowserItemState();
}
void BrowserStatusMonitor::ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) {
Browser* browser = NULL;
// Use |new_contents|. |old_contents| could be NULL.
DCHECK(new_contents);
browser = chrome::FindBrowserWithWebContents(new_contents);
// Update immediately on a tab change.
if (old_contents &&
(TabStripModel::kNoTab !=
browser->tab_strip_model()->GetIndexOfWebContents(old_contents))) {
UpdateAppItemState(old_contents, false /*remove*/);
}
if (new_contents) {
UpdateAppItemState(new_contents, false /*remove*/);
UpdateBrowserItemState();
SetShelfIDForBrowserWindowContents(browser, new_contents);
void BrowserStatusMonitor::OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) {
if (change.type() == TabStripModelChange::kInserted) {
for (const auto& delta : change.deltas())
OnTabInserted(delta.insert.contents);
} else if (change.type() == TabStripModelChange::kRemoved) {
for (const auto& delta : change.deltas()) {
if (delta.remove.will_be_deleted)
OnTabClosing(delta.remove.contents);
}
} else if (change.type() == TabStripModelChange::kReplaced) {
for (const auto& delta : change.deltas()) {
OnTabReplaced(tab_strip_model, delta.replace.old_contents,
delta.replace.new_contents);
}
}
}
void BrowserStatusMonitor::TabReplacedAt(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents,
int index) {
DCHECK(old_contents && new_contents);
Browser* browser = chrome::FindBrowserWithWebContents(new_contents);
UpdateAppItemState(old_contents, true /*remove*/);
RemoveWebContentsObserver(old_contents);
UpdateAppItemState(new_contents, false /*remove*/);
UpdateBrowserItemState();
if (tab_strip_model->GetActiveWebContents() == new_contents)
SetShelfIDForBrowserWindowContents(browser, new_contents);
AddWebContentsObserver(new_contents);
}
void BrowserStatusMonitor::TabInsertedAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index,
bool foreground) {
UpdateAppItemState(contents, false /*remove*/);
AddWebContentsObserver(contents);
}
if (tab_strip_model->empty())
return;
void BrowserStatusMonitor::TabClosingAt(TabStripModel* tab_strip_mode,
content::WebContents* contents,
int index) {
UpdateAppItemState(contents, true /*remove*/);
RemoveWebContentsObserver(contents);
if (selection.active_tab_changed())
OnActiveTabChanged(selection.old_contents, selection.new_contents);
}
void BrowserStatusMonitor::WebContentsDestroyed(
......@@ -236,6 +205,56 @@ bool BrowserStatusMonitor::IsV1AppInShelfWithAppId(const std::string& app_id) {
return false;
}
void BrowserStatusMonitor::OnActiveTabChanged(
content::WebContents* old_contents,
content::WebContents* new_contents) {
Browser* browser = nullptr;
// Use |new_contents|. |old_contents| could be nullptr.
DCHECK(new_contents);
browser = chrome::FindBrowserWithWebContents(new_contents);
// Update immediately on a tab change.
if (old_contents &&
(TabStripModel::kNoTab !=
browser->tab_strip_model()->GetIndexOfWebContents(old_contents))) {
UpdateAppItemState(old_contents, false /*remove*/);
}
if (new_contents) {
UpdateAppItemState(new_contents, false /*remove*/);
UpdateBrowserItemState();
SetShelfIDForBrowserWindowContents(browser, new_contents);
}
}
void BrowserStatusMonitor::OnTabReplaced(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents) {
DCHECK(old_contents && new_contents);
Browser* browser = chrome::FindBrowserWithWebContents(new_contents);
UpdateAppItemState(old_contents, true /*remove*/);
RemoveWebContentsObserver(old_contents);
UpdateAppItemState(new_contents, false /*remove*/);
UpdateBrowserItemState();
if (tab_strip_model->GetActiveWebContents() == new_contents)
SetShelfIDForBrowserWindowContents(browser, new_contents);
AddWebContentsObserver(new_contents);
}
void BrowserStatusMonitor::OnTabInserted(content::WebContents* contents) {
UpdateAppItemState(contents, false /*remove*/);
AddWebContentsObserver(contents);
}
void BrowserStatusMonitor::OnTabClosing(content::WebContents* contents) {
UpdateAppItemState(contents, true /*remove*/);
RemoveWebContentsObserver(contents);
}
void BrowserStatusMonitor::AddWebContentsObserver(
content::WebContents* contents) {
if (webcontents_to_observer_map_.find(contents) ==
......
chrome/browser/ui/ash/launcher/browser_status_monitor.h
View file @ 9775aabe
......@@ -55,21 +55,10 @@ class BrowserStatusMonitor : public BrowserTabStripTrackerDelegate,
void OnBrowserRemoved(Browser* browser) override;
// TabStripModelObserver overrides:
void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) override;
void TabReplacedAt(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents,
int index) override;
void TabInsertedAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index,
bool foreground) override;
void TabClosingAt(TabStripModel* tab_strip_mode,
content::WebContents* contents,
int index) override;
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override;
// Called from our own |LocalWebContentsObserver| when web contents did go
// away without any other notification. This might happen in case of
......@@ -92,6 +81,15 @@ class BrowserStatusMonitor : public BrowserTabStripTrackerDelegate,
private:
class LocalWebContentsObserver;
// Called by TabStripModelChanged()
void OnActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents);
void OnTabReplaced(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents);
void OnTabInserted(content::WebContents* contents);
void OnTabClosing(content::WebContents* contents);
// Create LocalWebContentsObserver for |contents|.
void AddWebContentsObserver(content::WebContents* contents);
......
chrome/browser/ui/ash/tab_scrubber_browsertest.cc
View file @ 9775aabe
......@@ -224,11 +224,14 @@ class TabScrubberTest : public InProcessBrowserTest,
}
// TabStripModelObserver overrides.
void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) override {
activation_order_.push_back(index);
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override {
if (tab_strip_model->empty() || !selection.active_tab_changed())
return;
activation_order_.push_back(selection.new_model.active());
}
// History of tab activation. Scrub() resets it.
......
chrome/browser/ui/ash/tablet_mode_client.cc
View file @ 9775aabe
......@@ -84,16 +84,20 @@ bool TabletModeClient::ShouldTrackBrowser(Browser* browser) {
return tablet_mode_enabled_;
}
void TabletModeClient::TabInsertedAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index,
bool foreground) {
void TabletModeClient::OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) {
if (change.type() != TabStripModelChange::kInserted)
return;
// We limit the mobile-like behavior to webcontents in tabstrips since many
// apps and extensions draw their own caption buttons and header frames. We
// don't want those to shrink down and resize to fit the width of their
// windows like webpages on mobile do. So this behavior is limited to webpages
// in tabs and packaged apps.
contents->NotifyPreferencesChanged();
for (const auto& delta : change.deltas())
delta.insert.contents->NotifyPreferencesChanged();
}
void TabletModeClient::FlushForTesting() {
......
chrome/browser/ui/ash/tablet_mode_client.h
View file @ 9775aabe
......@@ -49,10 +49,10 @@ class TabletModeClient : public ash::mojom::TabletModeClient,
bool ShouldTrackBrowser(Browser* browser) override;
// TabStripModelObserver:
void TabInsertedAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index,
bool foreground) override;
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override;
// Flushes the mojo pipe to ash.
void FlushForTesting();
......
chrome/browser/ui/browser_tab_strip_tracker.cc
View file @ 9775aabe
......@@ -67,15 +67,9 @@ void BrowserTabStripTracker::MaybeTrackBrowser(Browser* browser) {
TabStripModel* tab_strip_model = browser->tab_strip_model();
tab_strip_model->AddObserver(tab_strip_model_observer_);
const int active_index = tab_strip_model->active_index();
std::vector<TabStripModelChange::Delta> deltas;
for (int i = 0; i < tab_strip_model->count(); ++i) {
// TODO(sangwoo108): Delete this. https://crbug.com/842194.
tab_strip_model_observer_->TabInsertedAt(
tab_strip_model, tab_strip_model->GetWebContentsAt(i), i,
i == active_index);
deltas.push_back(TabStripModelChange::CreateInsertDelta(
tab_strip_model->GetWebContentsAt(i), i));
}
......
chrome/browser/ui/cocoa/handoff_active_url_observer.cc
View file @ 9775aabe
......@@ -40,13 +40,15 @@ void HandoffActiveURLObserver::OnBrowserRemoved(Browser* removed_browser) {
delegate_->HandoffActiveURLChanged(GetActiveWebContents());
}
void HandoffActiveURLObserver::ActiveTabChanged(
content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) {
StartObservingWebContents(new_contents);
delegate_->HandoffActiveURLChanged(new_contents);
void HandoffActiveURLObserver::OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) {
if (tab_strip_model->empty() || !selection.active_tab_changed())
return;
StartObservingWebContents(selection.new_contents);
delegate_->HandoffActiveURLChanged(selection.new_contents);
}
void HandoffActiveURLObserver::DidFinishNavigation(
......
chrome/browser/ui/cocoa/handoff_active_url_observer.h
View file @ 9775aabe
......@@ -33,10 +33,10 @@ class HandoffActiveURLObserver : public BrowserListObserver,
void OnBrowserRemoved(Browser* browser) override;
// TabStripModelObserver
void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) override;
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override;
// content::WebContentsObserver
void DidFinishNavigation(
......
chrome/browser/ui/cocoa/touchbar/browser_window_touch_bar_controller.mm
View file @ 9775aabe
......@@ -47,12 +47,15 @@ class API_AVAILABLE(macos(10.12.2)) WebContentsNotificationBridge
}
// TabStripModelObserver:
void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) override {
UpdateWebContents(new_contents);
contents_ = new_contents;
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override {
if (tab_strip_model->empty() || !selection.active_tab_changed())
return;
UpdateWebContents(selection.new_contents);
contents_ = selection.new_contents;
}
content::WebContents* contents() const { return contents_; }
......
chrome/browser/ui/tabs/tab_strip_model.cc
View file @ 9775aabe
......@@ -338,9 +338,6 @@ void TabStripModel::InsertWebContentsAt(int index,
selection_model_.IncrementFrom(index);
for (auto& observer : observers_)
observer.TabInsertedAt(this, raw_contents, index, active);
if (active) {
ui::ListSelectionModel new_model = selection_model_;
new_model.SetSelectedIndex(index);
......@@ -370,20 +367,12 @@ std::unique_ptr<content::WebContents> TabStripModel::ReplaceWebContentsAt(
std::unique_ptr<WebContents> old_contents =
contents_data_[index]->ReplaceWebContents(std::move(new_contents));
for (auto& observer : observers_)
observer.TabReplacedAt(this, old_contents.get(), raw_new_contents, index);
// When the active WebContents is replaced send out a selection notification
// too. We do this as nearly all observers need to treat a replacement of the
// selected contents as the selection changing.
if (active_index() == index) {
selection.new_contents = raw_new_contents;
selection.reason = TabStripModelObserver::CHANGE_REASON_REPLACED;
for (auto& observer : observers_) {
observer.ActiveTabChanged(selection.old_contents, selection.new_contents,
index,
TabStripModelObserver::CHANGE_REASON_REPLACED);
}
}
TabStripModelChange change(TabStripModelChange::kReplaced,
......@@ -479,24 +468,6 @@ void TabStripModel::SendDetachWebContentsNotifications(
dwc2->index_before_any_removals;
});
for (auto& dwc : notifications->detached_web_contents) {
// TabClosingAt() must be sent before TabDetachedAt(), since some observers
// use the former to change the behavior of the latter.
// TODO(erikchen): Combine these notifications. https://crbug.com/842194.
if (notifications->will_delete) {
for (auto& observer : observers_) {
observer.TabClosingAt(this, dwc->contents.get(),
dwc->index_before_any_removals);
}
}
// TabDetachedAt() allows observers that keep their own model of
// |contents_data_| to keep that model in sync.
for (auto& observer : observers_) {
observer.TabDetachedAt(
dwc->contents.get(), dwc->index_before_any_removals,
notifications->initially_active_web_contents == dwc->contents.get());
}
deltas.push_back(TabStripModelChange::CreateRemoveDelta(
dwc->contents.get(), dwc->index_before_any_removals,
notifications->will_delete));
......@@ -521,12 +492,8 @@ void TabStripModel::SendDetachWebContentsNotifications(
if (notifications->initially_active_web_contents &&
dwc->contents.get() == notifications->initially_active_web_contents) {
for (auto& observer : observers_)
observer.TabDeactivated(notifications->initially_active_web_contents);
if (!empty()) {
NotifyIfActiveTabChanged(selection);
}
if (!empty())
InstallRenderWigetVisibilityTracker(selection);
notifications->initially_active_web_contents = nullptr;
}
......@@ -537,11 +504,6 @@ void TabStripModel::SendDetachWebContentsNotifications(
}
}
if (!empty() && was_any_tab_selected) {
for (auto& observer : observers_)
observer.TabSelectionChanged(this, notifications->selection_model);
}
if (empty()) {
for (auto& observer : observers_)
observer.TabStripEmpty();
......@@ -1397,7 +1359,7 @@ WebContents* TabStripModel::GetWebContentsAtImpl(int index) const {
return contents_data_[index]->web_contents();
}
void TabStripModel::NotifyIfActiveTabChanged(
void TabStripModel::InstallRenderWigetVisibilityTracker(
const TabStripSelectionChange& selection) {
if (!selection.active_tab_changed())
return;
......@@ -1409,21 +1371,6 @@ void TabStripModel::NotifyIfActiveTabChanged(
->GetRenderWidgetHost();
}
RenderWidgetHostVisibilityTracker tracker(track_host);
for (auto& observer : observers_) {
observer.ActiveTabChanged(selection.old_contents, selection.new_contents,
active_index(), selection.reason);
}
}
void TabStripModel::NotifyIfActiveOrSelectionChanged(
const TabStripSelectionChange& selection) {
NotifyIfActiveTabChanged(selection);
if (selection.selection_changed()) {
for (auto& observer : observers_)
observer.TabSelectionChanged(this, selection.old_model);
}
}
TabStripSelectionChange TabStripModel::SetSelection(
......@@ -1436,19 +1383,13 @@ TabStripSelectionChange TabStripModel::SetSelection(
selection.new_model = new_model;
selection.reason = reason;
if (selection.old_contents &&
selection.old_model.active() != selection.new_model.active()) {
for (auto& observer : observers_)
observer.TabDeactivated(selection.old_contents);
}
// This is done after notifying TabDeactivated() because caller can assume
// that TabStripModel::active_index() would return the index for
// |selection.old_contents|.
selection_model_ = new_model;
selection.new_contents = GetActiveWebContents();
NotifyIfActiveOrSelectionChanged(selection);
InstallRenderWigetVisibilityTracker(selection);
if (!triggered_by_other_operation &&
(selection.active_tab_changed() || selection.selection_changed())) {
......@@ -1487,15 +1428,10 @@ void TabStripModel::MoveWebContentsAtImpl(int index,
std::move(moved_data));
selection_model_.Move(index, to_position, 1);
if (!selection_model_.IsSelected(to_position) && select_after_move) {
// TODO(sky): why doesn't this code notify observers?
if (!selection_model_.IsSelected(to_position) && select_after_move)
selection_model_.SetSelectedIndex(to_position);
}
selection.new_model = selection_model_;
for (auto& observer : observers_)
observer.TabMoved(web_contents, index, to_position);
TabStripModelChange change(
TabStripModelChange::kMoved,
TabStripModelChange::CreateMoveDelta(web_contents, index, to_position));
......
chrome/browser/ui/tabs/tab_strip_model.h
View file @ 9775aabe
......@@ -481,14 +481,8 @@ class TabStripModel {
std::vector<content::WebContents*> GetWebContentsesByIndices(
const std::vector<int>& indices);
// Notifies the observers if the active tab has changed.
void NotifyIfActiveTabChanged(const TabStripSelectionChange& selection);
// Notifies the observers if the active tab or the tab selection has changed.
// |old_model| is a snapshot of |selection_model_| before the change.
// Note: This function might end up sending 0 to 2 notifications in the
// following order: ActiveTabChanged, TabSelectionChanged.
void NotifyIfActiveOrSelectionChanged(
// Intalls RenderWidgetVisibilityTracker when the active tab has changed.
void InstallRenderWigetVisibilityTracker(
const TabStripSelectionChange& selection);
// Sets the selection to |new_model| and notifies any observers.
......
chrome/browser/ui/tabs/tab_strip_model_observer.cc
View file @ 9775aabe
......@@ -78,51 +78,11 @@ void TabStripModelObserver::OnTabStripModelChanged(
const TabStripModelChange& change,
const TabStripSelectionChange& selection) {}
void TabStripModelObserver::TabInsertedAt(TabStripModel* tab_strip_model,
WebContents* contents,
int index,
bool foreground) {
}
void TabStripModelObserver::TabClosingAt(TabStripModel* tab_strip_model,
WebContents* contents,
int index) {
}
void TabStripModelObserver::TabDetachedAt(WebContents* contents,
int index,
bool was_active) {}
void TabStripModelObserver::TabDeactivated(WebContents* contents) {
}
void TabStripModelObserver::ActiveTabChanged(WebContents* old_contents,
WebContents* new_contents,
int index,
int reason) {
}
void TabStripModelObserver::TabSelectionChanged(
TabStripModel* tab_strip_model,
const ui::ListSelectionModel& model) {
}
void TabStripModelObserver::TabMoved(WebContents* contents,
int from_index,
int to_index) {
}
void TabStripModelObserver::TabChangedAt(WebContents* contents,
int index,
TabChangeType change_type) {
}
void TabStripModelObserver::TabReplacedAt(TabStripModel* tab_strip_model,
WebContents* old_contents,
WebContents* new_contents,
int index) {
}
void TabStripModelObserver::TabPinnedStateChanged(
TabStripModel* tab_strip_model,
WebContents* contents,
......
chrome/browser/ui/tabs/tab_strip_model_observer.h
View file @ 9775aabe
......@@ -177,81 +177,6 @@ class TabStripModelObserver {
const TabStripModelChange& change,
const TabStripSelectionChange& selection);
// A new WebContents was inserted into the TabStripModel at the
// specified index. |foreground| is whether or not it was opened in the
// foreground (selected).
// DEPRECATED, use OnTabStripChanged() above.
// TODO(crbug.com/842194): Delete this and migrate callsites.
virtual void TabInsertedAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index,
bool foreground);
// The specified WebContents at |index| is being closed (and eventually
// destroyed). |tab_strip_model| is the TabStripModel that contained the tab.
// DEPRECATED, use OnTabStripChanged() above.
// TODO(erikchen): |index| is not used outside of tests. Do not use it. It
// will be removed soon. https://crbug.com/842194.
virtual void TabClosingAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index);
// The specified WebContents at |previous_index| has been detached, perhaps to
// be inserted in another TabStripModel. The implementer should take whatever
// action is necessary to deal with the WebContents no longer being present.
// |previous_index| cannot be used to index into the current state of the
// TabStripModel.
// DEPRECATED, use OnTabStripChanged() above.
// TODO(crbug.com/842194): Delete this and migrate callsites.
virtual void TabDetachedAt(content::WebContents* contents,
int previous_index,
bool was_active);
// The active WebContents is about to change from |old_contents|.
// This gives observers a chance to prepare for an impending switch before it
// happens.
// DEPRECATED, use OnTabStripChanged() above.
// TODO(crbug.com/842194): Delete this and migrate callsites.
virtual void TabDeactivated(content::WebContents* contents);
// Sent when the active tab changes. The previously active tab is identified
// by |old_contents| and the newly active tab by |new_contents|. |index| is
// the index of |new_contents|. If |reason| has CHANGE_REASON_REPLACED set
// then the web contents was replaced (see TabChangedAt). If |reason| has
// CHANGE_REASON_USER_GESTURE set then the web contents was changed due to a
// user input event (e.g. clicking on a tab, keystroke).
// Note: It is possible for the selection to change while the active tab
// remains unchanged. For example, control-click may not change the active tab
// but does change the selection. In this case |ActiveTabChanged| is not sent.
// If you care about any changes to the selection, override
// TabSelectionChanged.
// Note: |old_contents| will be NULL if there was no contents previously
// active.
// DEPRECATED, use OnTabStripChanged() above.
// TODO(crbug.com/842194): Delete this and migrate callsites.
virtual void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason);
// Sent when the selection changes in |tab_strip_model|. More precisely when
// selected tabs, anchor tab or active tab change. |old_model| is a snapshot
// of the selection model before the change. See also ActiveTabChanged for
// details.
// TODO(erikchen): |old_model| is not used outside of tests. Do not use it. It
// will be removed soon. https://crbug.com/842194.
// DEPRECATED, use OnTabStripChanged() above.
// TODO(crbug.com/842194): Delete this and migrate callsites.
virtual void TabSelectionChanged(TabStripModel* tab_strip_model,
const ui::ListSelectionModel& old_model);
// The specified WebContents at |from_index| was moved to |to_index|.
// DEPRECATED, use OnTabStripChanged() above.
// TODO(crbug.com/842194): Delete this and migrate callsites.
virtual void TabMoved(content::WebContents* contents,
int from_index,
int to_index);
// The specified WebContents at |index| changed in some way. |contents|
// may be an entirely different object and the old value is no longer
// available by the time this message is delivered.
......@@ -261,15 +186,6 @@ class TabStripModelObserver {
int index,
TabChangeType change_type);
// The WebContents was replaced at the specified index. This is invoked when
// prerendering swaps in a prerendered WebContents.
// DEPRECATED, use OnTabStripChanged() above.
// TODO(crbug.com/842194): Delete this and migrate callsites.
virtual void TabReplacedAt(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents,
int index);
// Invoked when the pinned state of a tab changes.
virtual void TabPinnedStateChanged(TabStripModel* tab_strip_model,
content::WebContents* contents,
......
chrome/browser/ui/tabs/tab_strip_model_unittest.cc
View file @ 9775aabe
......@@ -46,11 +46,6 @@ using extensions::Extension;
namespace {
// Generates the test names suffixes based on the value of the test param.
std::string ObserverTypeToString(const ::testing::TestParamInfo<bool>& info) {
return info.param ? "NewObserverUsed" : "LegacyObserverUsed";
}
class TabStripDummyDelegate : public TestTabStripModelDelegate {
public:
TabStripDummyDelegate() : run_unload_(false) {}
......@@ -121,14 +116,20 @@ class TabBlockedStateTestBrowser
private:
// TabStripModelObserver
void TabInsertedAt(TabStripModel* tab_strip_model,
WebContents* contents,
int index,
bool foreground) override {
web_modal::WebContentsModalDialogManager* manager =
web_modal::WebContentsModalDialogManager::FromWebContents(contents);
if (manager)
manager->SetDelegate(this);
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override {
if (change.type() != TabStripModelChange::kInserted)
return;
for (const auto& delta : change.deltas()) {
web_modal::WebContentsModalDialogManager* manager =
web_modal::WebContentsModalDialogManager::FromWebContents(
delta.insert.contents);
if (manager)
manager->SetDelegate(this);
}
}
// WebContentsModalDialogManagerDelegate
......@@ -278,102 +279,7 @@ class MockTabStripModelObserver : public TabStripModelObserver {
states_.push_back(s);
}
void TabChangedAt(WebContents* contents,
int index,
TabChangeType change_type) override {
states_.push_back(State(contents, index, CHANGE));
}
void TabPinnedStateChanged(TabStripModel* tab_strip_model,
WebContents* contents,
int index) override {
states_.push_back(State(contents, index, PINNED));
}
void TabStripEmpty() override { empty_ = true; }
void WillCloseAllTabs(TabStripModel* tab_strip_model) override {
states_.push_back(State(nullptr, -1, CLOSE_ALL));
}
void CloseAllTabsStopped(TabStripModel* tab_strip_model,
CloseAllStoppedReason reason) override {
if (reason == kCloseAllCanceled) {
states_.push_back(State(nullptr, -1, CLOSE_ALL_CANCELED));
} else if (reason == kCloseAllCompleted) {
states_.push_back(State(nullptr, -1, CLOSE_ALL_COMPLETED));
}
}
void ClearStates() { states_.clear(); }
bool empty() const { return empty_; }
TabStripModel* model() { return model_; }
private:
std::vector<State> states_;
bool empty_;
TabStripModel* model_;
DISALLOW_COPY_AND_ASSIGN(MockTabStripModelObserver);
};
class LegacyTabStripModelObserver : public MockTabStripModelObserver {
public:
explicit LegacyTabStripModelObserver(TabStripModel* model)
: MockTabStripModelObserver(model) {}
~LegacyTabStripModelObserver() override {}
// TabStripModelObserver implementation:
void TabInsertedAt(TabStripModel* tab_strip_model,
WebContents* contents,
int index,
bool foreground) override {
PushInsertState(contents, index, foreground);
}
void ActiveTabChanged(WebContents* old_contents,
WebContents* new_contents,
int index,
int reason) override {
PushActivateState(old_contents, new_contents, index, reason);
}
void TabSelectionChanged(TabStripModel* tab_strip_model,
const ui::ListSelectionModel& old_model) override {
PushSelectState(model()->GetActiveWebContents(), old_model,
model()->selection_model());
}
void TabMoved(WebContents* contents, int from_index, int to_index) override {
PushMoveState(contents, from_index, to_index);
}
void TabClosingAt(TabStripModel* tab_strip_model,
WebContents* contents,
int index) override {
PushCloseState(contents, index);
}
void TabDetachedAt(WebContents* contents,
int index,
bool was_active) override {
PushDetachState(contents, index, was_active);
}
void TabDeactivated(WebContents* contents) override {
PushDeactivateState(contents, model()->selection_model());
}
void TabReplacedAt(TabStripModel* tab_strip_model,
WebContents* old_contents,
WebContents* new_contents,
int index) override {
PushReplaceState(old_contents, new_contents, index);
}
private:
DISALLOW_COPY_AND_ASSIGN(LegacyTabStripModelObserver);
};
class NewTabStripModelObserver : public MockTabStripModelObserver {
public:
explicit NewTabStripModelObserver(TabStripModel* model)
: MockTabStripModelObserver(model) {}
~NewTabStripModelObserver() override {}
// TabStripModelObserver implementation:
// TabStripModelObserver overrides:
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
......@@ -408,13 +314,9 @@ class NewTabStripModelObserver : public MockTabStripModelObserver {
PushMoveState(delta.move.contents, delta.move.from_index,
delta.move.to_index);
}
// Selection change triggered by move shouldn't be counted as
// exsiting tests don't expect selection change in this case.
// TODO(sangwoo.ko): Update the tests in this class to not use the
// deprecated callbacks. https://crbug.com/842194
return;
break;
}
default:
case TabStripModelChange::kSelectionOnly:
break;
}
......@@ -431,15 +333,46 @@ class NewTabStripModelObserver : public MockTabStripModelObserver {
selection.new_model);
}
}
void TabChangedAt(WebContents* contents,
int index,
TabChangeType change_type) override {
states_.push_back(State(contents, index, CHANGE));
}
void TabPinnedStateChanged(TabStripModel* tab_strip_model,
WebContents* contents,
int index) override {
states_.push_back(State(contents, index, PINNED));
}
void TabStripEmpty() override { empty_ = true; }
void WillCloseAllTabs(TabStripModel* tab_strip_model) override {
states_.push_back(State(nullptr, -1, CLOSE_ALL));
}
void CloseAllTabsStopped(TabStripModel* tab_strip_model,
CloseAllStoppedReason reason) override {
if (reason == kCloseAllCanceled) {
states_.push_back(State(nullptr, -1, CLOSE_ALL_CANCELED));
} else if (reason == kCloseAllCompleted) {
states_.push_back(State(nullptr, -1, CLOSE_ALL_COMPLETED));
}
}
void ClearStates() { states_.clear(); }
bool empty() const { return empty_; }
TabStripModel* model() { return model_; }
private:
DISALLOW_COPY_AND_ASSIGN(NewTabStripModelObserver);
std::vector<State> states_;
bool empty_;
TabStripModel* model_;
DISALLOW_COPY_AND_ASSIGN(MockTabStripModelObserver);
};
} // namespace
class TabStripModelTest : public ChromeRenderViewHostTestHarness,
public testing::WithParamInterface<bool> {
class TabStripModelTest : public ChromeRenderViewHostTestHarness {
public:
std::unique_ptr<WebContents> CreateWebContents() {
return content::WebContentsTester::CreateTestWebContents(profile(),
......@@ -529,35 +462,13 @@ class TabStripModelTest : public ChromeRenderViewHostTestHarness,
selection_model.set_active(selection_model.selected_indices()[0]);
model->SetSelectionFromModel(selection_model);
}
bool ShouldUseNewObserver() const { return use_new_observer_; }
std::unique_ptr<MockTabStripModelObserver> CreateObserver(
TabStripModel* model) {
if (ShouldUseNewObserver()) {
return std::unique_ptr<MockTabStripModelObserver>(
new NewTabStripModelObserver(model));
}
return std::unique_ptr<MockTabStripModelObserver>(
new LegacyTabStripModelObserver(model));
}
void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
use_new_observer_ = GetParam();
}
private:
bool use_new_observer_;
};
TEST_P(TabStripModelTest, TestBasicAPI) {
TEST_F(TabStripModelTest, TestBasicAPI) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
std::unique_ptr<MockTabStripModelObserver> observer =
CreateObserver(&tabstrip);
tabstrip.AddObserver(observer.get());
MockTabStripModelObserver observer(&tabstrip);
tabstrip.AddObserver(&observer);
EXPECT_TRUE(tabstrip.empty());
......@@ -576,16 +487,16 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
tabstrip.AppendWebContents(std::move(contents1), true);
EXPECT_TRUE(tabstrip.ContainsIndex(0));
EXPECT_EQ(1, tabstrip.count());
EXPECT_EQ(3, observer->GetStateCount());
EXPECT_EQ(3, observer.GetStateCount());
State s1(raw_contents1, 0, MockTabStripModelObserver::INSERT);
s1.foreground = true;
EXPECT_TRUE(observer->StateEquals(0, s1));
EXPECT_TRUE(observer.StateEquals(0, s1));
State s2(raw_contents1, 0, MockTabStripModelObserver::ACTIVATE);
EXPECT_TRUE(observer->StateEquals(1, s2));
EXPECT_TRUE(observer.StateEquals(1, s2));
State s3(raw_contents1, 0, MockTabStripModelObserver::SELECT);
s3.src_index = ui::ListSelectionModel::kUnselectedIndex;
EXPECT_TRUE(observer->StateEquals(2, s3));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(2, s3));
observer.ClearStates();
}
EXPECT_EQ("1", GetTabStripStateString(tabstrip));
......@@ -597,19 +508,19 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
TabStripModel::ADD_ACTIVE);
EXPECT_EQ(2, tabstrip.count());
EXPECT_EQ(4, observer->GetStateCount());
EXPECT_EQ(4, observer.GetStateCount());
State s1(raw_contents2, 1, MockTabStripModelObserver::INSERT);
s1.foreground = true;
EXPECT_TRUE(observer->StateEquals(0, s1));
EXPECT_TRUE(observer.StateEquals(0, s1));
State s2(raw_contents1, 0, MockTabStripModelObserver::DEACTIVATE);
EXPECT_TRUE(observer->StateEquals(1, s2));
EXPECT_TRUE(observer.StateEquals(1, s2));
State s3(raw_contents2, 1, MockTabStripModelObserver::ACTIVATE);
s3.src_contents = raw_contents1;
EXPECT_TRUE(observer->StateEquals(2, s3));
EXPECT_TRUE(observer.StateEquals(2, s3));
State s4(raw_contents2, 1, MockTabStripModelObserver::SELECT);
s4.src_index = 0;
EXPECT_TRUE(observer->StateEquals(3, s4));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(3, s4));
observer.ClearStates();
}
EXPECT_EQ("1 2", GetTabStripStateString(tabstrip));
......@@ -621,28 +532,28 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
TabStripModel::ADD_NONE);
EXPECT_EQ(3, tabstrip.count());
EXPECT_EQ(1, observer->GetStateCount());
EXPECT_EQ(1, observer.GetStateCount());
State s1(raw_contents3, 2, MockTabStripModelObserver::INSERT);
s1.foreground = false;
EXPECT_TRUE(observer->StateEquals(0, s1));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(0, s1));
observer.ClearStates();
}
EXPECT_EQ("1 2 3", GetTabStripStateString(tabstrip));
// Test ActivateTabAt
{
tabstrip.ActivateTabAt(2, true);
EXPECT_EQ(3, observer->GetStateCount());
EXPECT_EQ(3, observer.GetStateCount());
State s1(raw_contents2, 1, MockTabStripModelObserver::DEACTIVATE);
EXPECT_TRUE(observer->StateEquals(0, s1));
EXPECT_TRUE(observer.StateEquals(0, s1));
State s2(raw_contents3, 2, MockTabStripModelObserver::ACTIVATE);
s2.src_contents = raw_contents2;
s2.change_reason = TabStripModelObserver::CHANGE_REASON_USER_GESTURE;
EXPECT_TRUE(observer->StateEquals(1, s2));
EXPECT_TRUE(observer.StateEquals(1, s2));
State s3(raw_contents3, 2, MockTabStripModelObserver::SELECT);
s3.src_index = 1;
EXPECT_TRUE(observer->StateEquals(2, s3));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(2, s3));
observer.ClearStates();
}
EXPECT_EQ("1 2 3", GetTabStripStateString(tabstrip));
......@@ -654,32 +565,31 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
WebContents* detached = detached_with_ownership.get();
// ... and append again because we want this for later.
tabstrip.AppendWebContents(std::move(detached_with_ownership), true);
EXPECT_EQ(8, observer->GetStateCount());
EXPECT_EQ(8, observer.GetStateCount());
State s1(detached, 2, MockTabStripModelObserver::DETACH);
EXPECT_TRUE(observer->StateEquals(0, s1));
State s2(detached, ShouldUseNewObserver() ? 2 : 1,
MockTabStripModelObserver::DEACTIVATE);
EXPECT_TRUE(observer->StateEquals(1, s2));
EXPECT_TRUE(observer.StateEquals(0, s1));
State s2(detached, 2, MockTabStripModelObserver::DEACTIVATE);
EXPECT_TRUE(observer.StateEquals(1, s2));
State s3(raw_contents2, 1, MockTabStripModelObserver::ACTIVATE);
s3.src_contents = raw_contents3;
s3.change_reason = TabStripModelObserver::CHANGE_REASON_NONE;
EXPECT_TRUE(observer->StateEquals(2, s3));
EXPECT_TRUE(observer.StateEquals(2, s3));
State s4(raw_contents2, 1, MockTabStripModelObserver::SELECT);
s4.src_index = 2;
EXPECT_TRUE(observer->StateEquals(3, s4));
EXPECT_TRUE(observer.StateEquals(3, s4));
State s5(detached, 2, MockTabStripModelObserver::INSERT);
s5.foreground = true;
EXPECT_TRUE(observer->StateEquals(4, s5));
EXPECT_TRUE(observer.StateEquals(4, s5));
State s6(raw_contents2, 1, MockTabStripModelObserver::DEACTIVATE);
EXPECT_TRUE(observer->StateEquals(5, s6));
EXPECT_TRUE(observer.StateEquals(5, s6));
State s7(detached, 2, MockTabStripModelObserver::ACTIVATE);
s7.src_contents = raw_contents2;
s7.change_reason = TabStripModelObserver::CHANGE_REASON_NONE;
EXPECT_TRUE(observer->StateEquals(6, s7));
EXPECT_TRUE(observer.StateEquals(6, s7));
State s8(detached, 2, MockTabStripModelObserver::SELECT);
s8.src_index = 1;
EXPECT_TRUE(observer->StateEquals(7, s8));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(7, s8));
observer.ClearStates();
}
EXPECT_EQ("1 2 3", GetTabStripStateString(tabstrip));
......@@ -688,22 +598,21 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
EXPECT_TRUE(tabstrip.CloseWebContentsAt(2, TabStripModel::CLOSE_NONE));
EXPECT_EQ(2, tabstrip.count());
EXPECT_EQ(5, observer->GetStateCount());
EXPECT_EQ(5, observer.GetStateCount());
State s1(raw_contents3, 2, MockTabStripModelObserver::CLOSE);
EXPECT_TRUE(observer->StateEquals(0, s1));
EXPECT_TRUE(observer.StateEquals(0, s1));
State s2(raw_contents3, 2, MockTabStripModelObserver::DETACH);
EXPECT_TRUE(observer->StateEquals(1, s2));
State s3(raw_contents3, ShouldUseNewObserver() ? 2 : 1,
MockTabStripModelObserver::DEACTIVATE);
EXPECT_TRUE(observer->StateEquals(2, s3));
EXPECT_TRUE(observer.StateEquals(1, s2));
State s3(raw_contents3, 2, MockTabStripModelObserver::DEACTIVATE);
EXPECT_TRUE(observer.StateEquals(2, s3));
State s4(raw_contents2, 1, MockTabStripModelObserver::ACTIVATE);
s4.src_contents = raw_contents3;
s4.change_reason = TabStripModelObserver::CHANGE_REASON_NONE;
EXPECT_TRUE(observer->StateEquals(3, s4));
EXPECT_TRUE(observer.StateEquals(3, s4));
State s5(raw_contents2, 1, MockTabStripModelObserver::SELECT);
s5.src_index = 2;
EXPECT_TRUE(observer->StateEquals(4, s5));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(4, s5));
observer.ClearStates();
}
EXPECT_EQ("1 2", GetTabStripStateString(tabstrip));
......@@ -711,26 +620,26 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
{
tabstrip.MoveWebContentsAt(1, 0, true);
EXPECT_EQ(1, observer->GetStateCount());
EXPECT_EQ(2, observer.GetStateCount());
State s1(raw_contents2, 0, MockTabStripModelObserver::MOVE);
s1.src_index = 1;
EXPECT_TRUE(observer->StateEquals(0, s1));
EXPECT_TRUE(observer.StateEquals(0, s1));
EXPECT_EQ(0, tabstrip.active_index());
observer->ClearStates();
observer.ClearStates();
}
EXPECT_EQ("2 1", GetTabStripStateString(tabstrip));
// Test MoveWebContentsAt, select_after_move == false
{
tabstrip.MoveWebContentsAt(1, 0, false);
EXPECT_EQ(1, observer->GetStateCount());
EXPECT_EQ(2, observer.GetStateCount());
State s1(raw_contents1, 0, MockTabStripModelObserver::MOVE);
s1.src_index = 1;
EXPECT_TRUE(observer->StateEquals(0, s1));
EXPECT_TRUE(observer.StateEquals(0, s1));
EXPECT_EQ(1, tabstrip.active_index());
tabstrip.MoveWebContentsAt(0, 1, false);
observer->ClearStates();
observer.ClearStates();
}
EXPECT_EQ("2 1", GetTabStripStateString(tabstrip));
......@@ -746,10 +655,10 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
// Test UpdateWebContentsStateAt
{
tabstrip.UpdateWebContentsStateAt(0, TabChangeType::kAll);
EXPECT_EQ(1, observer->GetStateCount());
EXPECT_EQ(1, observer.GetStateCount());
State s1(raw_contents2, 0, MockTabStripModelObserver::CHANGE);
EXPECT_TRUE(observer->StateEquals(0, s1));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(0, s1));
observer.ClearStates();
}
// Test SelectNextTab, SelectPreviousTab, SelectLastTab
......@@ -774,13 +683,13 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
EXPECT_EQ(0, tabstrip.active_index());
}
observer->ClearStates();
observer.ClearStates();
tabstrip.CloseAllTabs();
int close_all_count = 0, close_all_canceled_count = 0,
close_all_completed_count = 0;
observer->GetCloseCounts(&close_all_count, &close_all_canceled_count,
&close_all_completed_count);
observer.GetCloseCounts(&close_all_count, &close_all_canceled_count,
&close_all_completed_count);
EXPECT_EQ(1, close_all_count);
EXPECT_EQ(0, close_all_canceled_count);
EXPECT_EQ(1, close_all_completed_count);
......@@ -790,10 +699,10 @@ TEST_P(TabStripModelTest, TestBasicAPI) {
// Opener methods are tested below...
tabstrip.RemoveObserver(observer.get());
tabstrip.RemoveObserver(&observer);
}
TEST_P(TabStripModelTest, TestBasicOpenerAPI) {
TEST_F(TabStripModelTest, TestBasicOpenerAPI) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -891,7 +800,7 @@ static void InsertWebContentses(TabStripModel* tabstrip,
}
// Tests opening background tabs.
TEST_P(TabStripModelTest, TestLTRInsertionOptions) {
TEST_F(TabStripModelTest, TestLTRInsertionOptions) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -923,7 +832,7 @@ TEST_P(TabStripModelTest, TestLTRInsertionOptions) {
// that this tab is opened adjacent to the opener, then closes it.
// Finally it tests that a tab opened for some non-link purpose opens at the
// end of the strip, not bundled to any existing context.
TEST_P(TabStripModelTest, TestInsertionIndexDetermination) {
TEST_F(TabStripModelTest, TestInsertionIndexDetermination) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1003,7 +912,7 @@ TEST_P(TabStripModelTest, TestInsertionIndexDetermination) {
// Tests that non-adjacent tabs with an opener are ignored when deciding where
// to position tabs.
TEST_P(TabStripModelTest, TestInsertionIndexDeterminationAfterDragged) {
TEST_F(TabStripModelTest, TestInsertionIndexDeterminationAfterDragged) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1055,7 +964,7 @@ TEST_P(TabStripModelTest, TestInsertionIndexDeterminationAfterDragged) {
// Tests that grandchild tabs are considered to be opened by their grandparent
// tab when deciding where to position tabs.
TEST_P(TabStripModelTest, TestInsertionIndexDeterminationNestedOpener) {
TEST_F(TabStripModelTest, TestInsertionIndexDeterminationNestedOpener) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1133,7 +1042,7 @@ TEST_P(TabStripModelTest, TestInsertionIndexDeterminationNestedOpener) {
// If there are no other tabs that have the same opener,
// The opener is selected
//
TEST_P(TabStripModelTest, TestSelectOnClose) {
TEST_F(TabStripModelTest, TestSelectOnClose) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1211,7 +1120,7 @@ TEST_P(TabStripModelTest, TestSelectOnClose) {
// Tests IsContextMenuCommandEnabled and ExecuteContextMenuCommand with
// CommandCloseTab.
TEST_P(TabStripModelTest, CommandCloseTab) {
TEST_F(TabStripModelTest, CommandCloseTab) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1262,7 +1171,7 @@ TEST_P(TabStripModelTest, CommandCloseTab) {
// Tests IsContextMenuCommandEnabled and ExecuteContextMenuCommand with
// CommandCloseTabs.
TEST_P(TabStripModelTest, CommandCloseOtherTabs) {
TEST_F(TabStripModelTest, CommandCloseOtherTabs) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1324,7 +1233,7 @@ TEST_P(TabStripModelTest, CommandCloseOtherTabs) {
// Tests IsContextMenuCommandEnabled and ExecuteContextMenuCommand with
// CommandCloseTabsToRight.
TEST_P(TabStripModelTest, CommandCloseTabsToRight) {
TEST_F(TabStripModelTest, CommandCloseTabsToRight) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1347,7 +1256,7 @@ TEST_P(TabStripModelTest, CommandCloseTabsToRight) {
// Tests IsContextMenuCommandEnabled and ExecuteContextMenuCommand with
// CommandTogglePinned.
TEST_P(TabStripModelTest, CommandTogglePinned) {
TEST_F(TabStripModelTest, CommandTogglePinned) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1380,7 +1289,7 @@ TEST_P(TabStripModelTest, CommandTogglePinned) {
// - Close Tab
// - Close Other Tabs
// - Close Tabs To Right
TEST_P(TabStripModelTest, TestContextMenuCloseCommands) {
TEST_F(TabStripModelTest, TestContextMenuCloseCommands) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1429,7 +1338,7 @@ TEST_P(TabStripModelTest, TestContextMenuCloseCommands) {
}
// Tests GetIndicesClosedByCommand.
TEST_P(TabStripModelTest, GetIndicesClosedByCommand) {
TEST_F(TabStripModelTest, GetIndicesClosedByCommand) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1470,7 +1379,7 @@ TEST_P(TabStripModelTest, GetIndicesClosedByCommand) {
// Tests whether or not WebContentses are inserted in the correct position
// using this "smart" function with a simulated middle click action on a series
// of links on the home page.
TEST_P(TabStripModelTest, AddWebContents_MiddleClickLinksAndClose) {
TEST_F(TabStripModelTest, AddWebContents_MiddleClickLinksAndClose) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1540,7 +1449,7 @@ TEST_P(TabStripModelTest, AddWebContents_MiddleClickLinksAndClose) {
// Tests whether or not a WebContents created by a left click on a link
// that opens a new tab is inserted correctly adjacent to the tab that spawned
// it.
TEST_P(TabStripModelTest, AddWebContents_LeftClickPopup) {
TEST_F(TabStripModelTest, AddWebContents_LeftClickPopup) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1592,7 +1501,7 @@ TEST_P(TabStripModelTest, AddWebContents_LeftClickPopup) {
// Tests whether or not new tabs that should split context (typed pages,
// generated urls, also blank tabs) open at the end of the tabstrip instead of
// in the middle.
TEST_P(TabStripModelTest, AddWebContents_CreateNewBlankTab) {
TEST_F(TabStripModelTest, AddWebContents_CreateNewBlankTab) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1652,7 +1561,7 @@ TEST_P(TabStripModelTest, AddWebContents_CreateNewBlankTab) {
// Tests whether opener state is correctly forgotten when the user switches
// context.
TEST_P(TabStripModelTest, AddWebContents_ForgetOpeners) {
TEST_F(TabStripModelTest, AddWebContents_ForgetOpeners) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1718,7 +1627,7 @@ TEST_P(TabStripModelTest, AddWebContents_ForgetOpeners) {
}
// Added for http://b/issue?id=958960
TEST_P(TabStripModelTest, AppendContentsReselectionTest) {
TEST_F(TabStripModelTest, AppendContentsReselectionTest) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
EXPECT_TRUE(tabstrip.empty());
......@@ -1747,7 +1656,7 @@ TEST_P(TabStripModelTest, AppendContentsReselectionTest) {
}
// Added for http://b/issue?id=1027661
TEST_P(TabStripModelTest, ReselectionConsidersChildrenTest) {
TEST_F(TabStripModelTest, ReselectionConsidersChildrenTest) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
......@@ -1802,7 +1711,7 @@ TEST_P(TabStripModelTest, ReselectionConsidersChildrenTest) {
strip.CloseAllTabs();
}
TEST_P(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsOpener) {
TEST_F(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsOpener) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
......@@ -1876,7 +1785,7 @@ TEST_P(TabStripModelTest, AddWebContents_NewTabAtEndOfStripInheritsOpener) {
// A test of navigations in a tab that is part of a tree of openers from some
// parent tab. If the navigations are link clicks, the opener relationships of
// the tab. If they are of any other type, they are not preserved.
TEST_P(TabStripModelTest, NavigationForgetsOpeners) {
TEST_F(TabStripModelTest, NavigationForgetsOpeners) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
......@@ -1926,7 +1835,7 @@ TEST_P(TabStripModelTest, NavigationForgetsOpeners) {
// A test for the "quick look" use case where the user can open a new tab at the
// end of the tab strip, do one search, and then close the tab to get back to
// where they were.
TEST_P(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) {
TEST_F(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
......@@ -2022,12 +1931,11 @@ TEST_P(TabStripModelTest, NavigationForgettingDoesntAffectNewTab) {
#define MAYBE_FastShutdown FastShutdown
#endif
// Tests that fast shutdown is attempted appropriately.
TEST_P(TabStripModelTest, MAYBE_FastShutdown) {
TEST_F(TabStripModelTest, MAYBE_FastShutdown) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
std::unique_ptr<MockTabStripModelObserver> observer =
CreateObserver(&tabstrip);
tabstrip.AddObserver(observer.get());
MockTabStripModelObserver observer(&tabstrip);
tabstrip.AddObserver(&observer);
EXPECT_TRUE(tabstrip.empty());
......@@ -2086,12 +1994,11 @@ TEST_P(TabStripModelTest, MAYBE_FastShutdown) {
}
// Tests various permutations of pinning tabs.
TEST_P(TabStripModelTest, Pinning) {
TEST_F(TabStripModelTest, Pinning) {
TabStripDummyDelegate delegate;
TabStripModel tabstrip(&delegate, profile());
std::unique_ptr<MockTabStripModelObserver> observer =
CreateObserver(&tabstrip);
tabstrip.AddObserver(observer.get());
MockTabStripModelObserver observer(&tabstrip);
tabstrip.AddObserver(&observer);
EXPECT_TRUE(tabstrip.empty());
......@@ -2111,21 +2018,21 @@ TEST_P(TabStripModelTest, Pinning) {
tabstrip.AppendWebContents(CreateWebContentsWithID(2), false);
tabstrip.AppendWebContents(std::move(contents3), false);
observer->ClearStates();
observer.ClearStates();
// Pin the first tab, this shouldn't visually reorder anything.
{
tabstrip.SetTabPinned(0, true);
// As the order didn't change, we should get a pinned notification.
ASSERT_EQ(1, observer->GetStateCount());
ASSERT_EQ(1, observer.GetStateCount());
State state(raw_contents1, 0, MockTabStripModelObserver::PINNED);
EXPECT_TRUE(observer->StateEquals(0, state));
EXPECT_TRUE(observer.StateEquals(0, state));
// And verify the state.
EXPECT_EQ("1p 2 3", GetTabStripStateString(tabstrip));
observer->ClearStates();
observer.ClearStates();
}
// Unpin the first tab.
......@@ -2133,14 +2040,14 @@ TEST_P(TabStripModelTest, Pinning) {
tabstrip.SetTabPinned(0, false);
// As the order didn't change, we should get a pinned notification.
ASSERT_EQ(1, observer->GetStateCount());
ASSERT_EQ(1, observer.GetStateCount());
State state(raw_contents1, 0, MockTabStripModelObserver::PINNED);
EXPECT_TRUE(observer->StateEquals(0, state));
EXPECT_TRUE(observer.StateEquals(0, state));
// And verify the state.
EXPECT_EQ("1 2 3", GetTabStripStateString(tabstrip));
observer->ClearStates();
observer.ClearStates();
}
// Pin the 3rd tab, which should move it to the front.
......@@ -2148,18 +2055,18 @@ TEST_P(TabStripModelTest, Pinning) {
tabstrip.SetTabPinned(2, true);
// The pinning should have resulted in a move and a pinned notification.
ASSERT_EQ(2, observer->GetStateCount());
ASSERT_EQ(3, observer.GetStateCount());
State state(raw_contents3, 0, MockTabStripModelObserver::MOVE);
state.src_index = 2;
EXPECT_TRUE(observer->StateEquals(0, state));
EXPECT_TRUE(observer.StateEquals(0, state));
state = State(raw_contents3, 0, MockTabStripModelObserver::PINNED);
EXPECT_TRUE(observer->StateEquals(1, state));
EXPECT_TRUE(observer.StateEquals(2, state));
// And verify the state.
EXPECT_EQ("3p 1 2", GetTabStripStateString(tabstrip));
observer->ClearStates();
observer.ClearStates();
}
// Pin the tab "1", which shouldn't move anything.
......@@ -2167,14 +2074,14 @@ TEST_P(TabStripModelTest, Pinning) {
tabstrip.SetTabPinned(1, true);
// As the order didn't change, we should get a pinned notification.
ASSERT_EQ(1, observer->GetStateCount());
ASSERT_EQ(1, observer.GetStateCount());
State state(raw_contents1, 1, MockTabStripModelObserver::PINNED);
EXPECT_TRUE(observer->StateEquals(0, state));
EXPECT_TRUE(observer.StateEquals(0, state));
// And verify the state.
EXPECT_EQ("3p 1p 2", GetTabStripStateString(tabstrip));
observer->ClearStates();
observer.ClearStates();
}
// Try to move tab "2" to the front, it should be ignored.
......@@ -2182,41 +2089,41 @@ TEST_P(TabStripModelTest, Pinning) {
tabstrip.MoveWebContentsAt(2, 0, false);
// As the order didn't change, we should get a pinned notification.
ASSERT_EQ(0, observer->GetStateCount());
ASSERT_EQ(0, observer.GetStateCount());
// And verify the state.
EXPECT_EQ("3p 1p 2", GetTabStripStateString(tabstrip));
observer->ClearStates();
observer.ClearStates();
}
// Unpin tab "3", which implicitly moves it to the end.
{
tabstrip.SetTabPinned(0, false);
ASSERT_EQ(2, observer->GetStateCount());
ASSERT_EQ(3, observer.GetStateCount());
State state(raw_contents3, 1, MockTabStripModelObserver::MOVE);
state.src_index = 0;
EXPECT_TRUE(observer->StateEquals(0, state));
EXPECT_TRUE(observer.StateEquals(0, state));
state = State(raw_contents3, 1, MockTabStripModelObserver::PINNED);
EXPECT_TRUE(observer->StateEquals(1, state));
EXPECT_TRUE(observer.StateEquals(2, state));
// And verify the state.
EXPECT_EQ("1p 3 2", GetTabStripStateString(tabstrip));
observer->ClearStates();
observer.ClearStates();
}
// Unpin tab "3", nothing should happen.
{
tabstrip.SetTabPinned(1, false);
ASSERT_EQ(0, observer->GetStateCount());
ASSERT_EQ(0, observer.GetStateCount());
EXPECT_EQ("1p 3 2", GetTabStripStateString(tabstrip));
observer->ClearStates();
observer.ClearStates();
}
// Pin "3" and "1".
......@@ -2226,7 +2133,7 @@ TEST_P(TabStripModelTest, Pinning) {
EXPECT_EQ("1p 3p 2", GetTabStripStateString(tabstrip));
observer->ClearStates();
observer.ClearStates();
}
std::unique_ptr<WebContents> contents4 = CreateWebContentsWithID(4);
......@@ -2238,9 +2145,9 @@ TEST_P(TabStripModelTest, Pinning) {
tabstrip.InsertWebContentsAt(1, std::move(contents4),
TabStripModel::ADD_NONE);
ASSERT_EQ(1, observer->GetStateCount());
ASSERT_EQ(1, observer.GetStateCount());
State state(raw_contents4, 2, MockTabStripModelObserver::INSERT);
EXPECT_TRUE(observer->StateEquals(0, state));
EXPECT_TRUE(observer.StateEquals(0, state));
EXPECT_EQ("1p 3p 4 2", GetTabStripStateString(tabstrip));
}
......@@ -2250,7 +2157,7 @@ TEST_P(TabStripModelTest, Pinning) {
// Makes sure the TabStripModel calls the right observer methods during a
// replace.
TEST_P(TabStripModelTest, ReplaceSendsSelected) {
TEST_F(TabStripModelTest, ReplaceSendsSelected) {
typedef MockTabStripModelObserver::State State;
TabStripDummyDelegate delegate;
......@@ -2261,25 +2168,25 @@ TEST_P(TabStripModelTest, ReplaceSendsSelected) {
strip.AddWebContents(std::move(first_contents), -1, ui::PAGE_TRANSITION_TYPED,
TabStripModel::ADD_ACTIVE);
std::unique_ptr<MockTabStripModelObserver> observer = CreateObserver(&strip);
strip.AddObserver(observer.get());
MockTabStripModelObserver observer(&strip);
strip.AddObserver(&observer);
std::unique_ptr<WebContents> new_contents = CreateWebContents();
WebContents* raw_new_contents = new_contents.get();
strip.ReplaceWebContentsAt(0, std::move(new_contents));
ASSERT_EQ(2, observer->GetStateCount());
ASSERT_EQ(2, observer.GetStateCount());
// First event should be for replaced.
State state(raw_new_contents, 0, MockTabStripModelObserver::REPLACED);
state.src_contents = raw_first_contents;
EXPECT_TRUE(observer->StateEquals(0, state));
EXPECT_TRUE(observer.StateEquals(0, state));
// And the second for selected.
state = State(raw_new_contents, 0, MockTabStripModelObserver::ACTIVATE);
state.src_contents = raw_first_contents;
state.change_reason = TabStripModelObserver::CHANGE_REASON_REPLACED;
EXPECT_TRUE(observer->StateEquals(1, state));
EXPECT_TRUE(observer.StateEquals(1, state));
// Now add another tab and replace it, making sure we don't get a selected
// event this time.
......@@ -2288,25 +2195,25 @@ TEST_P(TabStripModelTest, ReplaceSendsSelected) {
strip.AddWebContents(std::move(third_contents), 1, ui::PAGE_TRANSITION_TYPED,
TabStripModel::ADD_NONE);
observer->ClearStates();
observer.ClearStates();
// And replace it.
new_contents = CreateWebContents();
raw_new_contents = new_contents.get();
strip.ReplaceWebContentsAt(1, std::move(new_contents));
ASSERT_EQ(1, observer->GetStateCount());
ASSERT_EQ(1, observer.GetStateCount());
state = State(raw_new_contents, 1, MockTabStripModelObserver::REPLACED);
state.src_contents = raw_third_contents;
EXPECT_TRUE(observer->StateEquals(0, state));
EXPECT_TRUE(observer.StateEquals(0, state));
strip.CloseAllTabs();
}
// Ensure pinned tabs are not mixed with non-pinned tabs when using
// MoveWebContentsAt.
TEST_P(TabStripModelTest, MoveWebContentsAtWithPinned) {
TEST_F(TabStripModelTest, MoveWebContentsAtWithPinned) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
ASSERT_NO_FATAL_FAILURE(PrepareTabstripForSelectionTest(&strip, 6, 3, "0"));
......@@ -2333,7 +2240,7 @@ TEST_P(TabStripModelTest, MoveWebContentsAtWithPinned) {
strip.CloseAllTabs();
}
TEST_P(TabStripModelTest, MoveSelectedTabsTo) {
TEST_F(TabStripModelTest, MoveSelectedTabsTo) {
struct TestData {
// Number of tabs the tab strip should have.
const int tab_count;
......@@ -2397,7 +2304,7 @@ TEST_P(TabStripModelTest, MoveSelectedTabsTo) {
}
// Tests that moving a tab forgets all openers referencing it.
TEST_P(TabStripModelTest, MoveSelectedTabsTo_ForgetOpeners) {
TEST_F(TabStripModelTest, MoveSelectedTabsTo_ForgetOpeners) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
......@@ -2461,7 +2368,7 @@ TEST_P(TabStripModelTest, MoveSelectedTabsTo_ForgetOpeners) {
strip.CloseAllTabs();
}
TEST_P(TabStripModelTest, CloseSelectedTabs) {
TEST_F(TabStripModelTest, CloseSelectedTabs) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
for (int i = 0; i < 3; ++i)
......@@ -2473,12 +2380,12 @@ TEST_P(TabStripModelTest, CloseSelectedTabs) {
strip.CloseAllTabs();
}
TEST_P(TabStripModelTest, MultipleSelection) {
TEST_F(TabStripModelTest, MultipleSelection) {
typedef MockTabStripModelObserver::State State;
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
std::unique_ptr<MockTabStripModelObserver> observer = CreateObserver(&strip);
MockTabStripModelObserver observer(&strip);
std::unique_ptr<WebContents> contents0 = CreateWebContents();
WebContents* raw_contents0 = contents0.get();
std::unique_ptr<WebContents> contents3 = CreateWebContents();
......@@ -2487,97 +2394,92 @@ TEST_P(TabStripModelTest, MultipleSelection) {
strip.AppendWebContents(CreateWebContents(), false);
strip.AppendWebContents(CreateWebContents(), false);
strip.AppendWebContents(std::move(contents3), false);
strip.AddObserver(observer.get());
strip.AddObserver(&observer);
// Selection and active tab change.
strip.ActivateTabAt(3, true);
ASSERT_EQ(2, observer->GetStateCount());
ASSERT_EQ(observer->GetStateAt(0).action,
MockTabStripModelObserver::ACTIVATE);
ASSERT_EQ(2, observer.GetStateCount());
ASSERT_EQ(observer.GetStateAt(0).action, MockTabStripModelObserver::ACTIVATE);
State s1(raw_contents3, 3, MockTabStripModelObserver::SELECT);
EXPECT_TRUE(observer->StateEquals(1, s1));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(1, s1));
observer.ClearStates();
// Adding all tabs to selection, active tab is now at 0.
strip.ExtendSelectionTo(0);
ASSERT_EQ(3, observer->GetStateCount());
ASSERT_EQ(observer->GetStateAt(0).action,
ASSERT_EQ(3, observer.GetStateCount());
ASSERT_EQ(observer.GetStateAt(0).action,
MockTabStripModelObserver::DEACTIVATE);
ASSERT_EQ(observer->GetStateAt(1).action,
MockTabStripModelObserver::ACTIVATE);
ASSERT_EQ(observer.GetStateAt(1).action, MockTabStripModelObserver::ACTIVATE);
State s2(raw_contents0, 0, MockTabStripModelObserver::SELECT);
s2.src_index = 3;
EXPECT_TRUE(observer->StateEquals(2, s2));
observer->ClearStates();
EXPECT_TRUE(observer.StateEquals(2, s2));
observer.ClearStates();
// Toggle the active tab, should make the next index active.
strip.ToggleSelectionAt(0);
EXPECT_EQ(1, strip.active_index());
EXPECT_EQ(3U, strip.selection_model().size());
EXPECT_EQ(4, strip.count());
ASSERT_EQ(3, observer->GetStateCount());
ASSERT_EQ(observer->GetStateAt(0).action,
ASSERT_EQ(3, observer.GetStateCount());
ASSERT_EQ(observer.GetStateAt(0).action,
MockTabStripModelObserver::DEACTIVATE);
ASSERT_EQ(observer->GetStateAt(1).action,
MockTabStripModelObserver::ACTIVATE);
ASSERT_EQ(observer->GetStateAt(2).action, MockTabStripModelObserver::SELECT);
observer->ClearStates();
ASSERT_EQ(observer.GetStateAt(1).action, MockTabStripModelObserver::ACTIVATE);
ASSERT_EQ(observer.GetStateAt(2).action, MockTabStripModelObserver::SELECT);
observer.ClearStates();
// Toggle the first tab back to selected and active.
strip.ToggleSelectionAt(0);
EXPECT_EQ(0, strip.active_index());
EXPECT_EQ(4U, strip.selection_model().size());
EXPECT_EQ(4, strip.count());
ASSERT_EQ(3, observer->GetStateCount());
ASSERT_EQ(observer->GetStateAt(0).action,
ASSERT_EQ(3, observer.GetStateCount());
ASSERT_EQ(observer.GetStateAt(0).action,
MockTabStripModelObserver::DEACTIVATE);
ASSERT_EQ(observer->GetStateAt(1).action,
MockTabStripModelObserver::ACTIVATE);
ASSERT_EQ(observer->GetStateAt(2).action, MockTabStripModelObserver::SELECT);
observer->ClearStates();
ASSERT_EQ(observer.GetStateAt(1).action, MockTabStripModelObserver::ACTIVATE);
ASSERT_EQ(observer.GetStateAt(2).action, MockTabStripModelObserver::SELECT);
observer.ClearStates();
// Closing one of the selected tabs, not the active one.
strip.CloseWebContentsAt(1, TabStripModel::CLOSE_NONE);
EXPECT_EQ(3, strip.count());
ASSERT_EQ(3, observer->GetStateCount());
ASSERT_EQ(observer->GetStateAt(0).action, MockTabStripModelObserver::CLOSE);
ASSERT_EQ(observer->GetStateAt(1).action, MockTabStripModelObserver::DETACH);
ASSERT_EQ(observer->GetStateAt(2).action, MockTabStripModelObserver::SELECT);
observer->ClearStates();
ASSERT_EQ(3, observer.GetStateCount());
ASSERT_EQ(observer.GetStateAt(0).action, MockTabStripModelObserver::CLOSE);
ASSERT_EQ(observer.GetStateAt(1).action, MockTabStripModelObserver::DETACH);
ASSERT_EQ(observer.GetStateAt(2).action, MockTabStripModelObserver::SELECT);
observer.ClearStates();
// Closing the active tab, while there are others tabs selected.
strip.CloseWebContentsAt(0, TabStripModel::CLOSE_NONE);
EXPECT_EQ(2, strip.count());
ASSERT_EQ(5, observer->GetStateCount());
ASSERT_EQ(observer->GetStateAt(0).action, MockTabStripModelObserver::CLOSE);
ASSERT_EQ(observer->GetStateAt(1).action, MockTabStripModelObserver::DETACH);
ASSERT_EQ(observer->GetStateAt(2).action,
ASSERT_EQ(5, observer.GetStateCount());
ASSERT_EQ(observer.GetStateAt(0).action, MockTabStripModelObserver::CLOSE);
ASSERT_EQ(observer.GetStateAt(1).action, MockTabStripModelObserver::DETACH);
ASSERT_EQ(observer.GetStateAt(2).action,
MockTabStripModelObserver::DEACTIVATE);
ASSERT_EQ(observer->GetStateAt(3).action,
MockTabStripModelObserver::ACTIVATE);
ASSERT_EQ(observer->GetStateAt(4).action, MockTabStripModelObserver::SELECT);
observer->ClearStates();
ASSERT_EQ(observer.GetStateAt(3).action, MockTabStripModelObserver::ACTIVATE);
ASSERT_EQ(observer.GetStateAt(4).action, MockTabStripModelObserver::SELECT);
observer.ClearStates();
// Active tab is at 0, deselecting all but the active tab.
strip.ToggleSelectionAt(1);
ASSERT_EQ(1, observer->GetStateCount());
ASSERT_EQ(observer->GetStateAt(0).action, MockTabStripModelObserver::SELECT);
observer->ClearStates();
ASSERT_EQ(1, observer.GetStateCount());
ASSERT_EQ(observer.GetStateAt(0).action, MockTabStripModelObserver::SELECT);
observer.ClearStates();
// Attempting to deselect the only selected and therefore active tab,
// it is ignored (no notifications being sent) and tab at 0 remains selected
// and active.
strip.ToggleSelectionAt(0);
ASSERT_EQ(0, observer->GetStateCount());
ASSERT_EQ(0, observer.GetStateCount());
strip.RemoveObserver(observer.get());
strip.RemoveObserver(&observer);
strip.CloseAllTabs();
}
// Verifies that if we change the selection from a multi selection to a single
// selection, but not in a way that changes the selected_index that
// TabSelectionChanged is invoked.
TEST_P(TabStripModelTest, MultipleToSingle) {
TEST_F(TabStripModelTest, MultipleToSingle) {
typedef MockTabStripModelObserver::State State;
TabStripDummyDelegate delegate;
......@@ -2589,23 +2491,23 @@ TEST_P(TabStripModelTest, MultipleToSingle) {
strip.ToggleSelectionAt(0);
strip.ToggleSelectionAt(1);
std::unique_ptr<MockTabStripModelObserver> observer = CreateObserver(&strip);
strip.AddObserver(observer.get());
MockTabStripModelObserver observer(&strip);
strip.AddObserver(&observer);
// This changes the selection (0 is no longer selected) but the selected_index
// still remains at 1.
strip.ActivateTabAt(1, true);
ASSERT_EQ(1, observer->GetStateCount());
ASSERT_EQ(1, observer.GetStateCount());
State s(raw_contents2, 1, MockTabStripModelObserver::SELECT);
s.src_index = 1;
s.change_reason = TabStripModelObserver::CHANGE_REASON_NONE;
EXPECT_TRUE(observer->StateEquals(0, s));
strip.RemoveObserver(observer.get());
EXPECT_TRUE(observer.StateEquals(0, s));
strip.RemoveObserver(&observer);
strip.CloseAllTabs();
}
// Verifies a newly inserted tab retains its previous blocked state.
// http://crbug.com/276334
TEST_P(TabStripModelTest, TabBlockedState) {
TEST_F(TabStripModelTest, TabBlockedState) {
// Start with a source tab strip.
TabStripDummyDelegate dummy_tab_strip_delegate;
TabStripModel strip_src(&dummy_tab_strip_delegate, profile());
......@@ -2659,7 +2561,7 @@ TEST_P(TabStripModelTest, TabBlockedState) {
// Verifies ordering of tabs opened via a link from a pinned tab with a
// subsequent pinned tab.
TEST_P(TabStripModelTest, LinkClicksWithPinnedTabOrdering) {
TEST_F(TabStripModelTest, LinkClicksWithPinnedTabOrdering) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
......@@ -2693,16 +2595,16 @@ TEST_P(TabStripModelTest, LinkClicksWithPinnedTabOrdering) {
// This test covers a bug in TabStripModel::MoveWebContentsAt(). Specifically
// if |select_after_move| was true it checked if the index
// select_after_move (as an int) was selected rather than |to_position|.
TEST_P(TabStripModelTest, MoveWebContentsAt) {
TEST_F(TabStripModelTest, MoveWebContentsAt) {
TabStripDummyDelegate delegate;
TabStripModel strip(&delegate, profile());
std::unique_ptr<MockTabStripModelObserver> observer = CreateObserver(&strip);
MockTabStripModelObserver observer(&strip);
strip.AppendWebContents(CreateWebContents(), false);
strip.AppendWebContents(CreateWebContents(), false);
strip.AppendWebContents(CreateWebContents(), false);
strip.AppendWebContents(CreateWebContents(), false);
strip.AddObserver(observer.get());
strip.AddObserver(&observer);
strip.ActivateTabAt(1, true);
EXPECT_EQ(1, strip.active_index());
......@@ -2712,9 +2614,3 @@ TEST_P(TabStripModelTest, MoveWebContentsAt) {
strip.CloseAllTabs();
}
// Instantiated TabStripModelTest with new observer and legacy observer.
INSTANTIATE_TEST_CASE_P(,
TabStripModelTest,
::testing::Values(true, false),
&ObserverTypeToString);
chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.cc
View file @ 9775aabe
......@@ -440,53 +440,44 @@ void TopControlsSlideControllerChromeOS::OnTabletModeToggled(
OnEnabledStateChanged(CanEnable(base::nullopt));
}
void TopControlsSlideControllerChromeOS::TabInsertedAt(
void TopControlsSlideControllerChromeOS::OnTabStripModelChanged(
TabStripModel* tab_strip_model,
content::WebContents* contents,
int index,
bool foreground) {
DCHECK(contents);
observed_tabs_.emplace(
contents, std::make_unique<TopControlsSlideTabObserver>(contents, this));
}
const TabStripModelChange& change,
const TabStripSelectionChange& selection) {
if (change.type() == TabStripModelChange::kInserted) {
for (const auto& delta : change.deltas()) {
content::WebContents* contents = delta.insert.contents;
observed_tabs_.emplace(
contents,
std::make_unique<TopControlsSlideTabObserver>(contents, this));
}
} else if (change.type() == TabStripModelChange::kRemoved) {
for (const auto& delta : change.deltas())
observed_tabs_.erase(delta.remove.contents);
} else if (change.type() == TabStripModelChange::kReplaced) {
for (const auto& delta : change.deltas()) {
observed_tabs_.erase(delta.replace.old_contents);
DCHECK(!observed_tabs_.count(delta.replace.new_contents));
observed_tabs_.emplace(delta.replace.new_contents,
std::make_unique<TopControlsSlideTabObserver>(
delta.replace.new_contents, this));
}
}
void TopControlsSlideControllerChromeOS::TabDetachedAt(
content::WebContents* contents,
int previous_index,
bool was_active) {
DCHECK(contents);
observed_tabs_.erase(contents);
}
if (tab_strip_model->empty() || !selection.active_tab_changed())
return;
void TopControlsSlideControllerChromeOS::ActiveTabChanged(
content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) {
DCHECK(new_contents);
DCHECK(observed_tabs_.count(new_contents));
content::WebContents* new_active_contents = selection.new_contents;
DCHECK(observed_tabs_.count(new_active_contents));
DCHECK(!is_gesture_scrolling_in_progress_);
// Restore the newly-activated tab's shown ratio. If this is a newly inserted
// tab, its |shown_ratio_| is 1.0f.
SetShownRatio(new_contents, observed_tabs_[new_contents]->shown_ratio());
UpdateBrowserControlsStateShown(new_contents, true /* animate */);
}
void TopControlsSlideControllerChromeOS::TabReplacedAt(
TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents,
int index) {
DCHECK(old_contents);
DCHECK(new_contents);
observed_tabs_.erase(old_contents);
DCHECK(!observed_tabs_.count(new_contents));
observed_tabs_.emplace(
new_contents,
std::make_unique<TopControlsSlideTabObserver>(new_contents, this));
SetShownRatio(new_active_contents,
observed_tabs_[new_active_contents]->shown_ratio());
UpdateBrowserControlsStateShown(new_active_contents, true /* animate */);
}
void TopControlsSlideControllerChromeOS::SetTabNeedsAttentionAt(
......
chrome/browser/ui/views/frame/top_controls_slide_controller_chromeos.h
View file @ 9775aabe
......@@ -59,23 +59,10 @@ class TopControlsSlideControllerChromeOS
void OnTabletModeToggled(bool tablet_mode_enabled) override;
// TabStripModelObserver:
// TODO(afakhry): The below overrides are deprecated, but we have to keep
// using them until Browser and BrowserView are migrated to the new API.
void TabInsertedAt(TabStripModel* tab_strip_model,
content::WebContents* contents,
int index,
bool foreground) override;
void TabDetachedAt(content::WebContents* contents,
int previous_index,
bool was_active) override;
void ActiveTabChanged(content::WebContents* old_contents,
content::WebContents* new_contents,
int index,
int reason) override;
void TabReplacedAt(TabStripModel* tab_strip_model,
content::WebContents* old_contents,
content::WebContents* new_contents,
int index) override;
void OnTabStripModelChanged(
TabStripModel* tab_strip_model,
const TabStripModelChange& change,
const TabStripSelectionChange& selection) override;
void SetTabNeedsAttentionAt(int index, bool attention) override;
// content::NotificationObserver:
......
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