Don't minimize dragged window when shelf hidden.

ash/wm/panels/panel_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/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 
 #include "ash/screen_util.h"
@@ skipping 533 matching lines @@
         RestorePanel(*iter);
       }
     }
     return;
   }
 
   if (restore_windows_on_shelf_visible_)
     return;
   scoped_ptr<aura::WindowTracker> minimized_windows(new aura::WindowTracker);
   for (PanelList::iterator iter = panel_windows_.begin();
-       iter != panel_windows_.end(); ++iter) {
-    if (iter->window->IsVisible()) {
-      minimized_windows->Add(iter->window);
-      wm::GetWindowState(iter->window)->Minimize();
+       iter != panel_windows_.end();) {
+    aura::Window* window = iter->window;
+    // Minimizing a panel window may remove it from the panel_windows_ list.
+    // Advance the iterator before minimizing it: http://crbug.com/393047.
+    ++iter;
+    if (window != dragged_panel_ && window->IsVisible()) {
+      minimized_windows->Add(window);
+      wm::GetWindowState(window)->Minimize();
     }
   }
   restore_windows_on_shelf_visible_ = minimized_windows.Pass();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // PanelLayoutManager private implementation:
 
 void PanelLayoutManager::MinimizePanel(aura::Window* panel) {
   ::wm::SetWindowVisibilityAnimationType(
@@ skipping 364 matching lines @@
       // Keyboard hidden, restore original bounds if they exist.
       SetChildBounds(panel, panel_state->GetRestoreBoundsInScreen());
     }
   }
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 }  // namespace ash