4 files changed, 11 insertions, 5 deletions
diff --git a/ash/wm/dock/docked_window_layout_manager.cc b/ash/wm/dock/docked_window_layout_manager.cc
index 8b64ffb..19f92f1 100644
--- a/ash/wm/dock/docked_window_layout_manager.cc
+++ b/ash/wm/dock/docked_window_layout_manager.cc
@@ -577,7 +577,7 @@ void DockedWindowLayoutManager::OnWindowShowTypeChanged(
     // Reparenting changes the source bounds for the animation if a window is
     // visible so hide it here and show later when it is already in the desktop.
     UndockWindow(window);
-  } else {
+  } else if (old_type == wm::SHOW_TYPE_MINIMIZED) {
     RestoreDockedWindow(window_state);
   }
 }
diff --git a/ash/wm/panels/panel_frame_view.cc b/ash/wm/panels/panel_frame_view.cc
index 0a6bce5..bafe29f 100644
--- a/ash/wm/panels/panel_frame_view.cc
+++ b/ash/wm/panels/panel_frame_view.cc
@@ -80,6 +80,10 @@ void PanelFrameView::Layout() {
   header_painter_->set_header_height(NonClientTopBorderHeight());
 }
 
+void PanelFrameView::GetWindowMask(const gfx::Size&, gfx::Path*) {
+  // Nothing.
+}
+
 void PanelFrameView::ResetWindowControls() {
   NOTIMPLEMENTED();
 }
@@ -99,10 +103,6 @@ void PanelFrameView::UpdateWindowTitle() {
   header_painter_->SchedulePaintForTitle(title_font_);
 }
 
-void PanelFrameView::GetWindowMask(const gfx::Size&, gfx::Path*) {
-  // Nothing.
-}
-
 int PanelFrameView::NonClientHitTest(const gfx::Point& point) {
   if (!header_painter_)
     return HTNOWHERE;
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc
index d037a76..c441524 100644
--- a/ash/wm/window_state.cc
+++ b/ash/wm/window_state.cc
@@ -75,6 +75,11 @@ bool WindowState::IsActive() const {
   return IsActiveWindow(window_);
 }
 
+bool WindowState::IsDocked() const {
+  return window_->parent() &&
+      window_->parent()->id() == internal::kShellWindowId_DockedContainer;
+}
+
 bool WindowState::CanMaximize() const {
   return window_->GetProperty(aura::client::kCanMaximizeKey);
 }
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h
index 653071f..560a91f 100644
--- a/ash/wm/window_state.h
+++ b/ash/wm/window_state.h
@@ -65,6 +65,7 @@ class ASH_EXPORT WindowState : public aura::WindowObserver {
   // SHOW_STATE_DEFAULT.
   bool IsNormalShowState() const;
   bool IsActive() const;
+  bool IsDocked() const;
 
   // Checks if the window can change its state accordingly.
   bool CanMaximize() const;