Save and restore State for ShellWindows, including panels

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/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/wm/window_animations.h"
@@ skipping 71 matching lines @@
 }
 
 void BaseLayoutManager::OnWindowRemovedFromLayout(aura::Window* child) {
 }
 
 void BaseLayoutManager::OnChildWindowVisibilityChanged(aura::Window* child,
                                                        bool visible) {
   if (visible && wm::IsWindowMinimized(child)) {
     // Attempting to show a minimized window. Unminimize it.
     child->SetProperty(aura::client::kShowStateKey,
-                       child->GetProperty(internal::kRestoreShowStateKey));
-    child->ClearProperty(internal::kRestoreShowStateKey);
+                       child->GetProperty(aura::client::kRestoreShowStateKey));
+    child->ClearProperty(aura::client::kRestoreShowStateKey);
   }
 }
 
 void BaseLayoutManager::SetChildBounds(aura::Window* child,
                                        const gfx::Rect& requested_bounds) {
   gfx::Rect child_bounds(requested_bounds);
   // Some windows rely on this to set their initial bounds.
   if (wm::IsWindowMaximized(child))
     child_bounds = ScreenAsh::GetMaximizedWindowBoundsInParent(child);
   else if (wm::IsWindowFullscreen(child))
@@ skipping 60 matching lines @@
   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // 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);
+    window->SetProperty(aura::client::kRestoreShowStateKey, last_show_state);
     views::corewm::SetWindowVisibilityAnimationType(
         window, WINDOW_VISIBILITY_ANIMATION_TYPE_MINIMIZE);
 
     // Hide the window.
     window->Hide();
     // Activate another window.
     if (wm::IsActiveWindow(window))
       wm::DeactivateWindow(window);
   } else if ((window->TargetVisibility() ||
               last_show_state == ui::SHOW_STATE_MINIMIZED) &&
@@ skipping 60 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