Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(332)

Side by Side Diff: ash/wm/screen_dimmer.cc

Issue 2907853002: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/shelf and ash/shell (removed some more wm_window.h) Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | ash/wm/screen_dimmer_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/screen_dimmer.h" 5 #include "ash/wm/screen_dimmer.h"
6 6
7 #include "ash/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/window_user_data.h" 9 #include "ash/window_user_data.h"
10 #include "ash/wm/container_finder.h" 10 #include "ash/wm/container_finder.h"
11 #include "ash/wm/window_dimmer.h" 11 #include "ash/wm/window_dimmer.h"
12 #include "ash/wm_window.h"
13 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
14 #include "ui/aura/window.h" 13 #include "ui/aura/window.h"
15 14
16 namespace ash { 15 namespace ash {
17 namespace { 16 namespace {
18 17
19 // Opacity when it's dimming the entire screen. 18 // Opacity when it's dimming the entire screen.
20 const float kDimmingLayerOpacityForRoot = 0.4f; 19 const float kDimmingLayerOpacityForRoot = 0.4f;
21 20
22 // Opacity for lock screen. 21 // Opacity for lock screen.
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 else 73 else
75 container->StackChildAtTop(window_dimmer->window()); 74 container->StackChildAtTop(window_dimmer->window());
76 window_dimmer->window()->Show(); 75 window_dimmer->window()->Show();
77 } else if (window_dimmer) { 76 } else if (window_dimmer) {
78 window_dimmers_->Set(container, nullptr); 77 window_dimmers_->Set(container, nullptr);
79 } 78 }
80 } 79 }
81 } 80 }
82 81
83 } // namespace ash 82 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/panels/panel_window_resizer_unittest.cc ('k') | ash/wm/screen_dimmer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698