diff options
| author | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 03:51:59 +0000 |
|---|---|---|
| committer | flackr@chromium.org <flackr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-11 03:51:59 +0000 |
| commit | 5a9a71fce45b18e0fd731e60c53a5222732dd05f (patch) | |
| tree | 707a37003ed0e458f1501273f4fcddbeceb1c9c7 /ash/wm | |
| parent | 30a4720e5a2b11c69cd5f99cab71baf12cd7b67b (diff) | |
| download | chromium_src-5a9a71fce45b18e0fd731e60c53a5222732dd05f.zip chromium_src-5a9a71fce45b18e0fd731e60c53a5222732dd05f.tar.gz chromium_src-5a9a71fce45b18e0fd731e60c53a5222732dd05f.tar.bz2 | |
Fix launcher icon observing window removals and remove suppression for PanelLayoutManagerTest.
BUG=256886
TEST=PanelLayoutManagerTest.PanelMoveBetweenMultipleDisplays
Review URL: https://chromiumcodereview.appspot.com/18720002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/panels/panel_layout_manager_unittest.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc index b152b9e..26f42cc 100644 --- a/ash/wm/panels/panel_layout_manager_unittest.cc +++ b/ash/wm/panels/panel_layout_manager_unittest.cc @@ -628,6 +628,16 @@ TEST_F(PanelLayoutManagerTest, PanelMoveBetweenMultipleDisplays) { EXPECT_EQ(root_windows[1], p2_d2->GetRootWindow()); EXPECT_TRUE(root_windows[0]->GetBoundsInScreen().Contains( p1_d2->GetBoundsInScreen())); + + // Test if clicking on a previously moved window moves the + // panel back to the original display. + ClickLauncherItemForWindow(launcher_view_1st, p1_d1.get()); + EXPECT_EQ(root_windows[0], p1_d1->GetRootWindow()); + EXPECT_EQ(root_windows[0], p2_d1->GetRootWindow()); + EXPECT_EQ(root_windows[0], p1_d2->GetRootWindow()); + EXPECT_EQ(root_windows[1], p2_d2->GetRootWindow()); + EXPECT_TRUE(root_windows[0]->GetBoundsInScreen().Contains( + p1_d1->GetBoundsInScreen())); } TEST_F(PanelLayoutManagerTest, PanelAttachPositionMultipleDisplays) { |