WorkspaceLayoutManager backdrop should fill entire region.

ash/wm/workspace/workspace_layout_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace/workspace_layout_manager.h"
 
+#include <string>

[jonross, 2014/06/16 18:50:58]

cpplint

+
 #include "ash/display/display_layout.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_observer.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 15 matching lines @@
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
 namespace {
 
 class MaximizeDelegateView : public views::WidgetDelegateView {
  public:
-  MaximizeDelegateView(const gfx::Rect& initial_bounds)
+  explicit MaximizeDelegateView(const gfx::Rect& initial_bounds)

[jonross, 2014/06/16 18:50:58]

cpplint

       : initial_bounds_(initial_bounds) {
   }
   virtual ~MaximizeDelegateView() {}
 
   virtual bool GetSavedWindowPlacement(
       const views::Widget* widget,
       gfx::Rect* bounds,
       ui::WindowShowState* show_state) const OVERRIDE {
     *bounds = initial_bounds_;
     *show_state = ui::SHOW_STATE_MAXIMIZED;
@@ skipping 882 matching lines @@
   window3.reset();
   EXPECT_EQ("b,x",
             GetWindowOrderAsString(backdrop, window1.get(), window2.get(),
                                    window3.get()));
   ShowTopWindowBackdrop(false);
   EXPECT_EQ("b",
             GetWindowOrderAsString(NULL, window1.get(), window2.get(),
                                    window3.get()));
 }
 
+// Tests that when hidding the shelf, that the backdrop resizes to fill the
+// entire workspace area.
+TEST_F(WorkspaceLayoutManagerBackdropTest, ShelfVisibilityChangesBounds) {
+  // Set to the size of the display to cause sizing issues with the shelf

[flackr, 2014/06/17 14:01:08]

The comment isn't clear, to cause what sizing issues? Are you intentionally
making the container overlap the shelf?

I'm also not sure I follow why you're forcing the default container bounds.
Isn't this reproducible with just shelf changes?

[jonross, 2014/06/17 14:05:58]

This is reproducible with just shelf changes. However this unittest class forces
the default container to have smaller bounds (line 795.) The documentation there
claims that this is to avoid sizing issues. I did not run the other tests with a
full sized default container to see what issues the comment refers to. However
with a smaller container the bug I'm testing for no longer occurs.

[flackr, 2014/06/17 14:13:25]

Can you check what those issues are? I'd prefer to see line 795 go and use the
default sizing.

[jonross, 2014/06/17 14:24:31]

The other tests pass with line 795 gone. Whatever errors it was documenting seem
to no longer occur. Removed it and line 951.

+  default_container()->SetBounds(gfx::Rect(0, 0, 800, 600));
+  ShelfLayoutManager* shelf_layout_manager =
+      Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
+  ShowTopWindowBackdrop(true);
+  RunAllPendingInMessageLoop();
+
+  gfx::Rect initial_bounds = default_container()->children()[0]->bounds();
+  shelf_layout_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
+  shelf_layout_manager->UpdateVisibilityState();
+
+  // When the shelf is re-shown WorkspaceLayoutManager shrinks all children
+  // including the backdrop.
+  shelf_layout_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_NEVER);
+  shelf_layout_manager->UpdateVisibilityState();
+  gfx::Rect reduced_bounds = default_container()->children()[0]->bounds();
+  EXPECT_LT(reduced_bounds.height(), initial_bounds.height());
+
+  shelf_layout_manager->SetAutoHideBehavior(SHELF_AUTO_HIDE_ALWAYS_HIDDEN);
+  shelf_layout_manager->UpdateVisibilityState();
+
+  EXPECT_GT(default_container()->children()[0]->bounds().height(),
+            reduced_bounds.height());
+}
+
 class WorkspaceLayoutManagerKeyboardTest : public test::AshTestBase {
  public:
   WorkspaceLayoutManagerKeyboardTest() {}
   virtual ~WorkspaceLayoutManagerKeyboardTest() {}
 
   virtual void SetUp() OVERRIDE {
     test::AshTestBase::SetUp();
     UpdateDisplay("800x600");
     aura::Window* default_container = Shell::GetContainer(
         Shell::GetPrimaryRootWindow(), kShellWindowId_DefaultContainer);
@@ skipping 21 matching lines @@
     layout_manager_->OnKeyboardBoundsChanging(gfx::Rect());
   }
 
   void SetKeyboardBounds(const gfx::Rect& bounds) {
     keyboard_bounds_ = bounds;
   }
 
  private:
   gfx::Insets restore_work_area_insets_;
   gfx::Rect keyboard_bounds_;
-  WorkspaceLayoutManager *layout_manager_;
+  WorkspaceLayoutManager* layout_manager_;

[jonross, 2014/06/16 18:50:58]

cpplint

 
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerKeyboardTest);
 };
 
 class FakeTextInputClient : public ui::DummyTextInputClient {
  public:
-  FakeTextInputClient(gfx::NativeWindow window) : window_(window) {}
+  explicit FakeTextInputClient(gfx::NativeWindow window) : window_(window) {}

[jonross, 2014/06/16 18:50:58]

cpplint

   virtual ~FakeTextInputClient() {}
 
   virtual gfx::NativeWindow GetAttachedWindow() const OVERRIDE {
     return window_;
   }
 
  private:
   gfx::NativeWindow window_;
 
   DISALLOW_COPY_AND_ASSIGN(FakeTextInputClient);
@@ skipping 32 matching lines @@
   window->SetBounds(gfx::Rect(50, 50, 100, 500));
   EXPECT_EQ("50,50 100x500", window->bounds().ToString());
   ShowKeyboard();
   EXPECT_EQ(gfx::Rect(50, 0, 100, available_height).ToString(),
             window->bounds().ToString());
   HideKeyboard();
   input_method->SetFocusedTextInputClient(NULL);
 }
 
 }  // namespace ash