Changes how we detect whether the launcher should be shown when

ash/wm/workspace/workspace_manager.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_manager.h"
 
 #include <algorithm>
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 141 matching lines @@
 }
 
 gfx::Rect WorkspaceManager::AlignBoundsToGrid(const gfx::Rect& bounds) {
   if (grid_size_ <= 1)
     return bounds;
   return AlignRectToGrid(bounds, grid_size_);
 }
 
 void WorkspaceManager::UpdateShelfVisibility() {
   if (!shelf_ || !active_workspace_) {
-    shelf_->SetState(ShelfLayoutManager::VISIBLE,
-                     ShelfLayoutManager::AUTO_HIDE_SHOWN);
+    shelf_->SetState(ShelfLayoutManager::VISIBLE);
     shelf_->SetWindowOverlapsShelf(false);
     return;
   }
 
   // TODO: this code needs to be made multi-monitor aware.
   gfx::Rect bounds(gfx::Screen::GetMonitorAreaNearestWindow(contents_view_));
   bounds.set_height(bounds.height() - shelf_->shelf_height());
   const aura::Window::Windows& windows(contents_view_->children());
   bool has_full_screen_window = false;
   bool has_max_window = false;
@@ skipping 12 matching lines @@
     if (wm::IsWindowFullscreen(*i)) {
       has_full_screen_window = true;
       break;
     }
     if (!window_overlaps_launcher && (*i)->bounds().bottom() > bounds.bottom())
       window_overlaps_launcher = true;
   }
 
   ShelfLayoutManager::VisibilityState visibility_state =
       ShelfLayoutManager::VISIBLE;
-  ShelfLayoutManager::AutoHideState auto_hide_state =
-      shelf_->auto_hide_state();
-  if (has_full_screen_window) {
+  if (has_full_screen_window)
     visibility_state = ShelfLayoutManager::HIDDEN;
-  } else if (has_max_window) {
+  else if (has_max_window)
     visibility_state = ShelfLayoutManager::AUTO_HIDE;
-  }
-  shelf_->SetState(visibility_state, auto_hide_state);
+  shelf_->SetState(visibility_state);
   shelf_->SetWindowOverlapsShelf(window_overlaps_launcher);
 }
 
 void WorkspaceManager::ShowStateChanged(aura::Window* window) {
   if (!IsManagedWindow(window) || !FindBy(window))
     return;
 
   Workspace::Type old_type = FindBy(window)->type();
   Workspace::Type new_type = Workspace::TypeForWindow(window);
   if (new_type != old_type)
@@ skipping 161 matching lines @@
   return workspace;
 }
 
 void WorkspaceManager::CleanupWorkspace(Workspace* workspace) {
   if (workspace->type() != Workspace::TYPE_MANAGED && workspace->is_empty())
     delete workspace;
 }
 
 }  // namespace internal
 }  // namespace ash