Breaks ShelfLayoutManagerTest.ShelfBackgroundColor on Win8 Aura

Revert 210763 "Sets the background color of shelf is opaque blac..."

> 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

TBR=mukai@chromium.org

Review URL: https://codereview.chromium.org/18980003

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

1 files changed, 2 insertions, 9 deletions

diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 939a057..d49f42a 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -13,7 +13,6 @@
 #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"
@@ -94,9 +93,6 @@ 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;
@@ -221,7 +217,6 @@ 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
@@ -232,13 +227,11 @@ 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;
   };
 
@@ -265,8 +258,8 @@ class ASH_EXPORT ShelfLayoutManager :
   // Updates the background of the shelf.
   void UpdateShelfBackground(BackgroundAnimator::ChangeType type);
 
-  // Returns how the shelf background is painted.
-  ShelfBackgroundType GetShelfBackgroundType() const;
+  // Returns whether the launcher should draw a background.
+  bool GetLauncherPaintsBackground() const;
 
   // Updates the auto hide state immediately.
   void UpdateAutoHideStateNow();