Fixes bug where launcher background would remain painted when it

ash/wm/workspace/workspace_layout_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_layout_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace/workspace.h"
@@ skipping 88 matching lines @@
     aura::Window* window,
     ui::WindowShowState last_show_state) {
   if (workspace_manager_->ShouldManageWindow(window)) {
     if (wm::IsWindowMinimized(window)) {
       workspace_manager_->RemoveWindow(window);
     } else if ((window->TargetVisibility() ||
                 last_show_state == ui::SHOW_STATE_MINIMIZED) &&
                !workspace_manager_->Contains(window)) {
       workspace_manager_->AddWindow(window);
     }
-  } else {
-    workspace_manager_->UpdateShelfVisibility();
   }
   BaseLayoutManager::ShowStateChanged(window, last_show_state);
   workspace_manager_->ShowStateChanged(window);
+  // As BaseLayoutManager::ShowStateChanged() may change the visibility of the
+  // window we need to invoke UpdateShelfVisibility() after ShowStateChanged().
+  workspace_manager_->UpdateShelfVisibility();
 }
 
 }  // namespace internal
 }  // namespace ash