summaryrefslogtreecommitdiffstats
path: root/ash/wm
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 10:48:54 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-10 10:48:54 +0000
commitd74fa8f5142843dea11d283d66d0ccb36c8db9e5 (patch)
treed0d921e384c99adccc12a5cc69feff66f68c4861 /ash/wm
parent3c3ea034a16267774aa1641388c11d147df491b8 (diff)
downloadchromium_src-d74fa8f5142843dea11d283d66d0ccb36c8db9e5.zip
chromium_src-d74fa8f5142843dea11d283d66d0ccb36c8db9e5.tar.gz
chromium_src-d74fa8f5142843dea11d283d66d0ccb36c8db9e5.tar.bz2
Removes the space for notification icon if it's not visible (2nd)
GridLayout will make the space for a child even if the child is not visible, which makes an extra space between status area and panels when there are no notifications. To remove this space, this CL makes StatusAreaWidgetDelegate catch child's visibility change, and do not count invisible children in its GridLayout. The previous CL was reverted due to test break on win_aura. This CL includes its fix. BUG=238770 TBR=stevenjb@chromium.org Review URL: https://chromiumcodereview.appspot.com/14969008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
-rw-r--r--ash/wm/panels/panel_window_resizer_unittest.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/ash/wm/panels/panel_window_resizer_unittest.cc b/ash/wm/panels/panel_window_resizer_unittest.cc
index 9039de2..ed28b76 100644
--- a/ash/wm/panels/panel_window_resizer_unittest.cc
+++ b/ash/wm/panels/panel_window_resizer_unittest.cc
@@ -35,6 +35,7 @@ class PanelWindowResizerTest : public test::AshTestBase {
virtual void SetUp() OVERRIDE {
AshTestBase::SetUp();
+ UpdateDisplay("600x400");
test::ShellTestApi test_api(Shell::GetInstance());
model_ = test_api.launcher_model();
}
@@ -263,7 +264,7 @@ TEST_F(PanelWindowResizerTest, MAYBE_PanelDetachReattachMultipleDisplays) {
}
TEST_F(PanelWindowResizerTest, MAYBE_DetachThenDragAcrossDisplays) {
- UpdateDisplay("400x400,400x400");
+ UpdateDisplay("600x400,600x400");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> window(
CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
@@ -291,7 +292,7 @@ TEST_F(PanelWindowResizerTest, MAYBE_DetachThenDragAcrossDisplays) {
}
TEST_F(PanelWindowResizerTest, MAYBE_DetachAcrossDisplays) {
- UpdateDisplay("400x400,400x400");
+ UpdateDisplay("600x400,600x400");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> window(
CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
@@ -309,7 +310,7 @@ TEST_F(PanelWindowResizerTest, MAYBE_DetachAcrossDisplays) {
}
TEST_F(PanelWindowResizerTest, MAYBE_DetachThenAttachToSecondDisplay) {
- UpdateDisplay("400x400,400x600");
+ UpdateDisplay("600x400,600x600");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> window(
CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
@@ -339,7 +340,7 @@ TEST_F(PanelWindowResizerTest, MAYBE_DetachThenAttachToSecondDisplay) {
}
TEST_F(PanelWindowResizerTest, MAYBE_AttachToSecondDisplay) {
- UpdateDisplay("400x400,400x600");
+ UpdateDisplay("600x400,600x600");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
scoped_ptr<aura::Window> window(
CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));