summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tabs
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-23 16:38:18 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-23 16:38:18 +0000
commitbcd9dc4cf88b89675eb605ffba94d345b33ee216 (patch)
treeff21eb32ea7616f5214da97913600c03d8c5ef92 /chrome/browser/tabs
parent847e54fa9cdae2714e081e0c3170e8348355236e (diff)
downloadchromium_src-bcd9dc4cf88b89675eb605ffba94d345b33ee216.zip
chromium_src-bcd9dc4cf88b89675eb605ffba94d345b33ee216.tar.gz
chromium_src-bcd9dc4cf88b89675eb605ffba94d345b33ee216.tar.bz2
Extension tweaks for phantom tabs. I did the following modifications:
. Modified chrome.tabs.executeScript so that it sends error message if failure in sending message (which happens with phantom tabs). . When a tab is made phantom we send TabInsertedAt event. . Made connecting to a phantom tab send disconnect. . Disallow changing the url of pinned tabs. . Disallow closing phantom tabs. . Detect language fails for phantom tabs. And I removed the flag for phantom tabs. BUG=25309 TEST=on windows or chromeos create a window with a couple of tabs, pin the first, then close it. Selection should change to another tab and the favicon of the closed tab should remain, but not the tab border. control-tab should not select the phantom tab, but if you click on the phantom tab it should become live again and the border should reappear. Review URL: http://codereview.chromium.org/552110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36964 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
-rw-r--r--chrome/browser/tabs/tab_strip_model.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index 39f4b66..409815a 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -397,10 +397,7 @@ bool TabStripModel::IsTabPinned(int index) const {
bool TabStripModel::IsAppTab(int index) const {
// TODO (sky): this is temporary and should be integrated with real apps.
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnablePhantomTabs) &&
- browser_defaults::kPinnedTabsActLikeApps &&
- IsTabPinned(index);
+ return browser_defaults::kPinnedTabsActLikeApps && IsTabPinned(index);
}
bool TabStripModel::IsPhantomTab(int index) const {