summaryrefslogtreecommitdiffstats
path: root/chrome/browser/defaults.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 20:16:53 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-05 20:16:53 +0000
commit464b0dd4cd94623495c88cd1d879e9c7be45be9f (patch)
treedcc1a55b55c493061a7845e261feda3bf8466d21 /chrome/browser/defaults.cc
parent81bc31690d650df788b2a8779e6bd3c4bf248c7c (diff)
downloadchromium_src-464b0dd4cd94623495c88cd1d879e9c7be45be9f.zip
chromium_src-464b0dd4cd94623495c88cd1d879e9c7be45be9f.tar.gz
chromium_src-464b0dd4cd94623495c88cd1d879e9c7be45be9f.tar.bz2
Implements mini-tab support for linux.
BUG=36797 TEST=make sure pinned tabs work on linux. Review URL: http://codereview.chromium.org/669163 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/defaults.cc')
-rw-r--r--chrome/browser/defaults.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index 89bd8a2..f924cc7 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -46,12 +46,6 @@ const bool kCanToggleSystemTitleBar = true;
#endif
-#if defined(TOOLKIT_VIEWS)
-const bool kEnablePinnedTabs = true;
-#else
-const bool kEnablePinnedTabs = false;
-#endif
-
#if !defined(OS_CHROMEOS)
const SessionStartupPref::Type kDefaultSessionStartupType =
@@ -76,8 +70,11 @@ const bool kShowOtherBrowsersInAboutMemory = true;
#if defined(OS_MACOSX)
const bool kBrowserAliveWithNoWindows = true;
+// When this gets enabled on Mac, remove this default.
+const bool kEnablePinnedTabs = false;
#else
const bool kBrowserAliveWithNoWindows = false;
+const bool kEnablePinnedTabs = true;
#endif
} // namespace browser_defaults