Sets the background color of shelf is opaque black when maximized.

Previously the black color was achieved by hiding the desktop background.
Now shelf's background color is opaque black instead.

Note that right now BaseLayoutManagerTest fails, but it'll be fixed by
crrev.com/18326024

BUG=252422
R=jamescook@chromium.org
TEST=covered by the new tests

Review URL: https://chromiumcodereview.appspot.com/18339008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210763 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 2 deletions

diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index d49f42a..939a057 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -13,6 +13,7 @@
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell_observer.h"
 #include "ash/system/status_area_widget.h"
+#include "ash/wm/workspace/workspace_types.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ -93,6 +94,9 @@ class ASH_EXPORT ShelfLayoutManager :
 
   bool in_layout() const { return in_layout_; }
 
+  // Clears internal data for shutdown process.
+  void PrepareForShutdown();
+
   // Returns whether the shelf and its contents (launcher, status) are visible
   // on the screen.
   bool IsVisible() const;
@@ -217,6 +221,7 @@ class ASH_EXPORT ShelfLayoutManager :
   struct State {
     State() : visibility_state(SHELF_VISIBLE),
               auto_hide_state(SHELF_AUTO_HIDE_HIDDEN),
+              window_state(WORKSPACE_WINDOW_STATE_DEFAULT),
               is_screen_locked(false) {}
 
     // Returns true if the two states are considered equal. As
@@ -227,11 +232,13 @@ class ASH_EXPORT ShelfLayoutManager :
       return other.visibility_state == visibility_state &&
           (visibility_state != SHELF_AUTO_HIDE ||
            other.auto_hide_state == auto_hide_state) &&
+          other.window_state == window_state &&
           other.is_screen_locked == is_screen_locked;
     }
 
     ShelfVisibilityState visibility_state;
     ShelfAutoHideState auto_hide_state;
+    WorkspaceWindowState window_state;
     bool is_screen_locked;
   };
 
@@ -258,8 +265,8 @@ class ASH_EXPORT ShelfLayoutManager :
   // Updates the background of the shelf.
   void UpdateShelfBackground(BackgroundAnimator::ChangeType type);
 
-  // Returns whether the launcher should draw a background.
-  bool GetLauncherPaintsBackground() const;
+  // Returns how the shelf background is painted.
+  ShelfBackgroundType GetShelfBackgroundType() const;
 
   // Updates the auto hide state immediately.
   void UpdateAutoHideStateNow();