diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 20:31:10 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-22 20:31:10 +0000 |
| commit | 3d58bf7f98b0bc1b26c5d7c919edd49e919273a8 (patch) | |
| tree | 20571bb66ed6e45d3236e5a537042234f40ebff4 /chrome/browser/tabs/tab_strip_model_unittest.cc | |
| parent | 54fe91778e4ed5d5a8a513c6883ae40a2a7c1f6f (diff) | |
| download | chromium_src-3d58bf7f98b0bc1b26c5d7c919edd49e919273a8.zip chromium_src-3d58bf7f98b0bc1b26c5d7c919edd49e919273a8.tar.gz chromium_src-3d58bf7f98b0bc1b26c5d7c919edd49e919273a8.tar.bz2 | |
Disables phantom tabs. I'm not nuking all the code as Nicholas/Glen thought we may yet try them again shortly.
BUG=46852
TEST=none
Review URL: http://codereview.chromium.org/2833026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50511 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs/tab_strip_model_unittest.cc')
| -rw-r--r-- | chrome/browser/tabs/tab_strip_model_unittest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 51f9543..11fb91d 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -9,6 +9,7 @@ #include "base/string_util.h" #include "base/stl_util-inl.h" #include "base/string_util.h" +#include "chrome/browser/defaults.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" @@ -1770,6 +1771,9 @@ TEST_F(TabStripModelTest, Pinning) { // Tests various permutations of making a tab phantom. TEST_F(TabStripModelTest, Phantom) { + if (!browser_defaults::kPhantomTabsEnabled) + return; + TabStripDummyDelegate delegate(NULL); TabStripModel tabstrip(&delegate, profile()); MockTabStripModelObserver observer; |