| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/common/wm/window_dimmer.h" | 5 #include "ash/wm/window_dimmer.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/common/wm_shell.h" | 9 #include "ash/wm_shell.h" |
| 10 #include "ash/common/wm_window.h" | 10 #include "ash/wm_window.h" |
| 11 #include "base/time/time.h" | 11 #include "base/time/time.h" |
| 12 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 13 #include "ui/compositor/layer.h" | 13 #include "ui/compositor/layer.h" |
| 14 #include "ui/wm/core/window_animations.h" | 14 #include "ui/wm/core/window_animations.h" |
| 15 | 15 |
| 16 namespace ash { | 16 namespace ash { |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 const int kDefaultDimAnimationDurationMs = 200; | 19 const int kDefaultDimAnimationDurationMs = 200; |
| 20 | 20 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 const HierarchyChangeParams& params) { | 79 const HierarchyChangeParams& params) { |
| 80 if (WmWindow::Get(params.receiver) == window_ && | 80 if (WmWindow::Get(params.receiver) == window_ && |
| 81 params.target == params.receiver) { | 81 params.target == params.receiver) { |
| 82 // This may happen on a display change or some unexpected condition. Hide | 82 // This may happen on a display change or some unexpected condition. Hide |
| 83 // the window to ensure it isn't obscuring the wrong thing. | 83 // the window to ensure it isn't obscuring the wrong thing. |
| 84 window_->Hide(); | 84 window_->Hide(); |
| 85 } | 85 } |
| 86 } | 86 } |
| 87 | 87 |
| 88 } // namespace ash | 88 } // namespace ash |
| OLD | NEW |