| 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/phantom_window_controller.h" | 5 #include "ash/wm/workspace/phantom_window_controller.h" |
| 6 | 6 |
| 7 #include <math.h> | 7 #include <math.h> |
| 8 | 8 |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 136 phantom_widget->Show(); | 136 phantom_widget->Show(); |
| 137 | 137 |
| 138 // Fade the window in. | 138 // Fade the window in. |
| 139 ui::Layer* widget_layer = phantom_widget->GetNativeWindow()->layer(); | 139 ui::Layer* widget_layer = phantom_widget->GetNativeWindow()->layer(); |
| 140 widget_layer->SetOpacity(0); | 140 widget_layer->SetOpacity(0); |
| 141 ui::ScopedLayerAnimationSettings scoped_setter(widget_layer->GetAnimator()); | 141 ui::ScopedLayerAnimationSettings scoped_setter(widget_layer->GetAnimator()); |
| 142 scoped_setter.SetTransitionDuration( | 142 scoped_setter.SetTransitionDuration( |
| 143 base::TimeDelta::FromMilliseconds(kAnimationDurationMs)); | 143 base::TimeDelta::FromMilliseconds(kAnimationDurationMs)); |
| 144 widget_layer->SetOpacity(1); | 144 widget_layer->SetOpacity(1); |
| 145 | 145 |
| 146 return phantom_widget.Pass(); | 146 return phantom_widget; |
| 147 } | 147 } |
| 148 | 148 |
| 149 } // namespace ash | 149 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1547223002:
Convert Pass()→std::move() in //ash (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master