| 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> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" |
| 10 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 ui::LayerAnimationElement::VISIBILITY); | 127 ui::LayerAnimationElement::VISIBILITY); |
| 128 settings.SetTweenType(gfx::Tween::EASE_OUT); | 128 settings.SetTweenType(gfx::Tween::EASE_OUT); |
| 129 settings.SetTransitionDuration( | 129 settings.SetTransitionDuration( |
| 130 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); | 130 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); |
| 131 viewport_->layer()->SetTransform(gfx::Transform()); | 131 viewport_->layer()->SetTransform(gfx::Transform()); |
| 132 viewport_->layer()->SetOpacity(1.0f); | 132 viewport_->layer()->SetOpacity(1.0f); |
| 133 } | 133 } |
| 134 } | 134 } |
| 135 | 135 |
| 136 void WorkspaceController::SetMaximizeBackdropDelegate( | 136 void WorkspaceController::SetMaximizeBackdropDelegate( |
| 137 scoped_ptr<WorkspaceLayoutManagerDelegate> delegate) { | 137 std::unique_ptr<WorkspaceLayoutManagerDelegate> delegate) { |
| 138 layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate)); | 138 layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate)); |
| 139 } | 139 } |
| 140 | 140 |
| 141 } // namespace ash | 141 } // namespace ash |
| OLD | NEW |