diff options
author | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 16:06:05 +0000 |
---|---|---|
committer | jstritar@chromium.org <jstritar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 16:06:05 +0000 |
commit | 4ce39887a02c9877976b7e6686a877dd0961c7a2 (patch) | |
tree | 5cb84e28ca7ccca9998f17148bfd5dd5efd4c0d8 /chrome/browser/tabs/tab_strip_model_unittest.cc | |
parent | 6e6f2bb1d57b20c85e4636504bd723f75a7b3200 (diff) | |
download | chromium_src-4ce39887a02c9877976b7e6686a877dd0961c7a2.zip chromium_src-4ce39887a02c9877976b7e6686a877dd0961c7a2.tar.gz chromium_src-4ce39887a02c9877976b7e6686a877dd0961c7a2.tar.bz2 |
Add pinned property to tabs.update and create.
Fire tabs.onUpdated event if a tab's pinned state changes.
BUG=24781
TEST=ExtensionApiTest
Review URL: http://codereview.chromium.org/3816005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65379 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 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index a08a5bc..81847e9 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -1685,12 +1685,15 @@ TEST_F(TabStripModelTest, Pinning) { { tabstrip.SetTabPinned(2, true); - // The pinning should have resulted in a move. - ASSERT_EQ(1, observer.GetStateCount()); + // The pinning should have resulted in a move and a pinned notification. + ASSERT_EQ(2, observer.GetStateCount()); State state(contents3, 0, MockTabStripModelObserver::MOVE); state.src_index = 2; EXPECT_TRUE(observer.StateEquals(0, state)); + state = State(contents3, 0, MockTabStripModelObserver::PINNED); + EXPECT_TRUE(observer.StateEquals(1, state)); + // And verify the state. EXPECT_EQ("3p 1 2", GetPinnedState(tabstrip)); @@ -1729,11 +1732,14 @@ TEST_F(TabStripModelTest, Pinning) { { tabstrip.SetTabPinned(0, false); - ASSERT_EQ(1, observer.GetStateCount()); + ASSERT_EQ(2, observer.GetStateCount()); State state(contents3, 1, MockTabStripModelObserver::MOVE); state.src_index = 0; EXPECT_TRUE(observer.StateEquals(0, state)); + state = State(contents3, 1, MockTabStripModelObserver::PINNED); + EXPECT_TRUE(observer.StateEquals(1, state)); + // And verify the state. EXPECT_EQ("1p 3 2", GetPinnedState(tabstrip)); |