| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/workspace_controller.h" | 5 #include "ash/wm/workspace_controller.h" |
| 6 | 6 |
| 7 #include <utility> |
| 8 |
| 7 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
| 9 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 12 #include "ash/shell_window_ids.h" |
| 11 #include "ash/wm/window_animations.h" | 13 #include "ash/wm/window_animations.h" |
| 12 #include "ash/wm/window_state.h" | 14 #include "ash/wm/window_state.h" |
| 13 #include "ash/wm/window_util.h" | 15 #include "ash/wm/window_util.h" |
| 14 #include "ash/wm/workspace/workspace_event_handler.h" | 16 #include "ash/wm/workspace/workspace_event_handler.h" |
| 15 #include "ash/wm/workspace/workspace_layout_manager.h" | 17 #include "ash/wm/workspace/workspace_layout_manager.h" |
| 16 #include "ash/wm/workspace/workspace_layout_manager_delegate.h" | 18 #include "ash/wm/workspace/workspace_layout_manager_delegate.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 settings.SetTweenType(gfx::Tween::EASE_OUT); | 128 settings.SetTweenType(gfx::Tween::EASE_OUT); |
| 127 settings.SetTransitionDuration( | 129 settings.SetTransitionDuration( |
| 128 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); | 130 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); |
| 129 viewport_->layer()->SetTransform(gfx::Transform()); | 131 viewport_->layer()->SetTransform(gfx::Transform()); |
| 130 viewport_->layer()->SetOpacity(1.0f); | 132 viewport_->layer()->SetOpacity(1.0f); |
| 131 } | 133 } |
| 132 } | 134 } |
| 133 | 135 |
| 134 void WorkspaceController::SetMaximizeBackdropDelegate( | 136 void WorkspaceController::SetMaximizeBackdropDelegate( |
| 135 scoped_ptr<WorkspaceLayoutManagerDelegate> delegate) { | 137 scoped_ptr<WorkspaceLayoutManagerDelegate> delegate) { |
| 136 layout_manager_->SetMaximizeBackdropDelegate(delegate.Pass()); | 138 layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate)); |
| 137 } | 139 } |
| 138 | 140 |
| 139 } // namespace ash | 141 } // namespace ash |
| OLD | NEW |