Remove ash::window::Show() from BaseLayoutManager::OnWindowActivated

ash/wm/base_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/base_layout_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_animations.h"
@@ skipping 136 matching lines @@
     root_window_->RemoveObserver(this);
     root_window_ = NULL;
   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, aura::client::ActivationChangeObserver implementation:
 
 void BaseLayoutManager::OnWindowActivated(aura::Window* gained_active,
                                           aura::Window* lost_active) {
-  if (gained_active && wm::IsWindowMinimized(gained_active)) {

[Ben Goodger (Google), 2013/01/07 22:10:18]

Can you try running ash_unittests with --use-focus-controller? I bet this breaks
something there.

-    gained_active->Show();
-    DCHECK(!wm::IsWindowMinimized(gained_active));
-  }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // BaseLayoutManager, private:
 
 void BaseLayoutManager::ShowStateChanged(aura::Window* window,
                                          ui::WindowShowState last_show_state) {
   if (wm::IsWindowMinimized(window)) {
     // Save the previous show state so that we can correctly restore it.
     window->SetProperty(internal::kRestoreShowStateKey, last_show_state);
@@ skipping 70 matching lines @@
       // Put as much of the window as possible within the display area.
       gfx::Rect bounds = window->bounds();
       bounds.AdjustToFit(display_rect);
       window->SetBounds(bounds);
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash