summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sessions/session_service_unittest.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 19:14:33 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-28 19:14:33 +0000
commitd3038bf0175f75df75385a17298134a2ee39b8a1 (patch)
treeeb795e71e50dfc7bb5f791af24e5d85b0abe54ac /chrome/browser/sessions/session_service_unittest.cc
parentdb921de9330f6245dc93cf1529c8c180e74d1ae8 (diff)
downloadchromium_src-d3038bf0175f75df75385a17298134a2ee39b8a1.zip
chromium_src-d3038bf0175f75df75385a17298134a2ee39b8a1.tar.gz
chromium_src-d3038bf0175f75df75385a17298134a2ee39b8a1.tar.bz2
Disables pinned tabs until I land apps. I've #ifdef parts that are
going to stay around, but need to be disabled for now. BUG=32845 TEST=make sure pinned tabs are disabled for now. Review URL: http://codereview.chromium.org/557026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37421 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions/session_service_unittest.cc')
-rw-r--r--chrome/browser/sessions/session_service_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_service_unittest.cc b/chrome/browser/sessions/session_service_unittest.cc
index 1fec7f3..25fc8ad 100644
--- a/chrome/browser/sessions/session_service_unittest.cc
+++ b/chrome/browser/sessions/session_service_unittest.cc
@@ -553,7 +553,9 @@ TEST_F(SessionServiceTest, PinnedFalseWhenSetToFalse) {
EXPECT_FALSE(CreateAndWriteSessionWithOneTab(false, true));
}
-// Explicitly set the pinned state to false and make sure we get back true.
+#if defined(ENABLE_PINNED_TABS)
+// Explicitly set the pinned state to true and make sure we get back true.
TEST_F(SessionServiceTest, PinnedTrue) {
EXPECT_TRUE(CreateAndWriteSessionWithOneTab(true, true));
}
+#endif