diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 06:10:57 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-09 06:10:57 +0000 |
| commit | 68eeede20e63fbb9a8756ed73e482b87dde57c72 (patch) | |
| tree | 26d1bd889cbfd7b32131d585a97dcb9b447b8733 /ash/wm/workspace/workspace_layout_manager.cc | |
| parent | c2ff9b4ec2549c5b3b36c11fe2fca7b5495adf9a (diff) | |
| download | chromium_src-68eeede20e63fbb9a8756ed73e482b87dde57c72.zip chromium_src-68eeede20e63fbb9a8756ed73e482b87dde57c72.tar.gz chromium_src-68eeede20e63fbb9a8756ed73e482b87dde57c72.tar.bz2 | |
Save and restore State for ShellWindows, including panels
This replaces ShellWindow::CreateParams::State with
ui::WindowShowState for simplicty and consistency with
Browser session restore.
BUG=233556
TBR=flackr@chromium.org, skuhne@chromium.org, sky@chromium.org
Original CL: https://codereview.chromium.org/14031021/
+ disabled flakey browser tests on linux
Review URL: https://chromiumcodereview.appspot.com/14663010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace/workspace_layout_manager.cc')
| -rw-r--r-- | ash/wm/workspace/workspace_layout_manager.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/wm/workspace/workspace_layout_manager.cc b/ash/wm/workspace/workspace_layout_manager.cc index 65ed116..e4e6c84 100644 --- a/ash/wm/workspace/workspace_layout_manager.cc +++ b/ash/wm/workspace/workspace_layout_manager.cc @@ -126,8 +126,8 @@ void WorkspaceLayoutManager::OnChildWindowVisibilityChanged(Window* child, 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); } workspace_manager()->OnWorkspaceChildWindowVisibilityChanged(workspace_, child); @@ -257,7 +257,7 @@ void WorkspaceLayoutManager::ShowStateChanged( if (wm::IsWindowMinimized(window)) { DCHECK(!cloned_layer); // 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); workspace_manager()->OnWorkspaceWindowShowStateChanged( |