summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
diff options
context:
space:
mode:
authorbenwells <benwells@chromium.org>2015-06-02 22:02:53 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-03 05:03:28 +0000
commit90d364c5c2a956df4c3e6724699367ec1da3cec5 (patch)
tree318b63cd4537b3be00c5ddf57a1aee95aece8076 /chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
parentf0a364eade26aa3c977fc9ce94a738dd4796ac06 (diff)
downloadchromium_src-90d364c5c2a956df4c3e6724699367ec1da3cec5.zip
chromium_src-90d364c5c2a956df4c3e6724699367ec1da3cec5.tar.gz
chromium_src-90d364c5c2a956df4c3e6724699367ec1da3cec5.tar.bz2
Remove code which makes app tabs always pinned.
The code which is being removed makes view source on a hosted / bookmark app window always pinned and isn't used any more. BUG=442624 Review URL: https://codereview.chromium.org/1150213003 Cr-Commit-Position: refs/heads/master@{#332555}
Diffstat (limited to 'chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc')
-rw-r--r--chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 0e4bb70..961ebf4 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -482,11 +482,6 @@ void BrowserTabStripController::TabReplacedAt(TabStripModel* tab_strip_model,
void BrowserTabStripController::TabPinnedStateChanged(WebContents* contents,
int model_index) {
- // Currently none of the renderers render pinned state differently.
-}
-
-void BrowserTabStripController::TabMiniStateChanged(WebContents* contents,
- int model_index) {
SetTabDataAt(contents, model_index);
}
@@ -510,8 +505,8 @@ void BrowserTabStripController::SetTabRendererDataFromModel(
data->loading = contents->IsLoading();
data->crashed_status = contents->GetCrashedStatus();
data->incognito = contents->GetBrowserContext()->IsOffTheRecord();
- data->mini = model_->IsMiniTab(model_index);
- data->show_icon = data->mini || favicon::ShouldDisplayFavicon(contents);
+ data->pinned = model_->IsTabPinned(model_index);
+ data->show_icon = data->pinned || favicon::ShouldDisplayFavicon(contents);
data->blocked = model_->IsTabBlocked(model_index);
data->app = extensions::TabHelper::FromWebContents(contents)->is_app();
data->media_state = chrome::GetTabMediaStateForContents(contents);