| 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 "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
| 8 #include "ash/shelf/shelf_layout_manager.h" | 8 #include "ash/shelf/shelf_layout_manager.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| 11 #include "ash/wm/window_animations.h" | 11 #include "ash/wm/window_animations.h" |
| 12 #include "ash/wm/window_state.h" | 12 #include "ash/wm/window_state.h" |
| 13 #include "ash/wm/window_util.h" | 13 #include "ash/wm/window_util.h" |
| 14 #include "ash/wm/workspace/workspace_event_handler.h" | 14 #include "ash/wm/workspace/workspace_event_handler.h" |
| 15 #include "ash/wm/workspace/workspace_layout_manager.h" | 15 #include "ash/wm/workspace/workspace_layout_manager.h" |
| 16 #include "ash/wm/workspace/workspace_layout_manager_delegate.h" |
| 16 #include "ui/aura/client/activation_client.h" | 17 #include "ui/aura/client/activation_client.h" |
| 17 #include "ui/aura/client/aura_constants.h" | 18 #include "ui/aura/client/aura_constants.h" |
| 18 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
| 19 #include "ui/aura/window_event_dispatcher.h" | 20 #include "ui/aura/window_event_dispatcher.h" |
| 20 #include "ui/compositor/layer.h" | 21 #include "ui/compositor/layer.h" |
| 21 #include "ui/compositor/scoped_layer_animation_settings.h" | 22 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 22 #include "ui/views/corewm/visibility_controller.h" | 23 #include "ui/views/corewm/visibility_controller.h" |
| 23 #include "ui/views/corewm/window_animations.h" | 24 #include "ui/views/corewm/window_animations.h" |
| 24 | 25 |
| 25 namespace ash { | 26 namespace ash { |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 ui::LayerAnimationElement::BRIGHTNESS | | 129 ui::LayerAnimationElement::BRIGHTNESS | |
| 129 ui::LayerAnimationElement::VISIBILITY); | 130 ui::LayerAnimationElement::VISIBILITY); |
| 130 settings.SetTweenType(gfx::Tween::EASE_OUT); | 131 settings.SetTweenType(gfx::Tween::EASE_OUT); |
| 131 settings.SetTransitionDuration( | 132 settings.SetTransitionDuration( |
| 132 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); | 133 base::TimeDelta::FromMilliseconds(kCrossFadeDurationMS)); |
| 133 viewport_->layer()->SetTransform(gfx::Transform()); | 134 viewport_->layer()->SetTransform(gfx::Transform()); |
| 134 viewport_->layer()->SetOpacity(1.0f); | 135 viewport_->layer()->SetOpacity(1.0f); |
| 135 } | 136 } |
| 136 } | 137 } |
| 137 | 138 |
| 139 void WorkspaceController::SetMaximizeBackdropDelegate( |
| 140 scoped_ptr<WorkspaceLayoutManagerDelegate> delegate) { |
| 141 layout_manager_->SetMaximizeBackdropDelegate(delegate.Pass()); |
| 142 } |
| 143 |
| 138 } // namespace internal | 144 } // namespace internal |
| 139 } // namespace ash | 145 } // namespace ash |
| OLD | NEW |