summaryrefslogtreecommitdiffstats
path: root/ash/wm/workspace/workspace_layout_manager.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/wm/workspace/workspace_layout_manager.cc')
-rw-r--r--ash/wm/workspace/workspace_layout_manager.cc6
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(