| 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/common/wm/screen_dimmer.h" | 5 #include "ash/wm/screen_dimmer.h" |
| 6 | 6 |
| 7 #include "ash/common/wm/container_finder.h" | |
| 8 #include "ash/common/wm/window_dimmer.h" | |
| 9 #include "ash/common/wm_shell.h" | |
| 10 #include "ash/common/wm_window.h" | |
| 11 #include "ash/common/wm_window_user_data.h" | |
| 12 #include "ash/public/cpp/shell_window_ids.h" | 7 #include "ash/public/cpp/shell_window_ids.h" |
| 8 #include "ash/wm/container_finder.h" |
| 9 #include "ash/wm/window_dimmer.h" |
| 10 #include "ash/wm_shell.h" |
| 11 #include "ash/wm_window.h" |
| 12 #include "ash/wm_window_user_data.h" |
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 14 | 14 |
| 15 namespace ash { | 15 namespace ash { |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // Opacity when it's dimming the entire screen. | 18 // Opacity when it's dimming the entire screen. |
| 19 const float kDimmingLayerOpacityForRoot = 0.4f; | 19 const float kDimmingLayerOpacityForRoot = 0.4f; |
| 20 | 20 |
| 21 // Opacity for lock screen. | 21 // Opacity for lock screen. |
| 22 const float kDimmingLayerOpacityForLockScreen = 0.5f; | 22 const float kDimmingLayerOpacityForLockScreen = 0.5f; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 else | 73 else |
| 74 container->StackChildAtTop(window_dimmer->window()); | 74 container->StackChildAtTop(window_dimmer->window()); |
| 75 window_dimmer->window()->Show(); | 75 window_dimmer->window()->Show(); |
| 76 } else if (window_dimmer) { | 76 } else if (window_dimmer) { |
| 77 window_dimmers_->Set(container, nullptr); | 77 window_dimmers_->Set(container, nullptr); |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 } | 80 } |
| 81 | 81 |
| 82 } // namespace ash | 82 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2736573002:
chromeos: Move files in //ash/common to //ash, part 2 (Closed)
