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

Unified Diff: ash/common/wm/screen_dimmer.cc

Issue 2739763003: Moves maintaining ShellObservers back to Shell (Closed)
Patch Set: merge Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/wm/panels/panel_layout_manager.cc ('k') | ash/common/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/screen_dimmer.cc
diff --git a/ash/common/wm/screen_dimmer.cc b/ash/common/wm/screen_dimmer.cc
index 2b697faf7e1ba2560d5f83ed1d7c4bfa6bd3fc07..8304d118252ea8ee4d09c263390d74121adde646 100644
--- a/ash/common/wm/screen_dimmer.cc
+++ b/ash/common/wm/screen_dimmer.cc
@@ -10,6 +10,7 @@
#include "ash/common/wm_window.h"
#include "ash/common/wm_window_user_data.h"
#include "ash/public/cpp/shell_window_ids.h"
+#include "ash/shell.h"
#include "base/memory/ptr_util.h"
namespace ash {
@@ -28,13 +29,13 @@ ScreenDimmer::ScreenDimmer(Container container)
is_dimming_(false),
at_bottom_(false),
window_dimmers_(base::MakeUnique<WmWindowUserData<WindowDimmer>>()) {
- WmShell::Get()->AddShellObserver(this);
+ Shell::GetInstance()->AddShellObserver(this);
}
ScreenDimmer::~ScreenDimmer() {
// Usage in chrome results in ScreenDimmer outliving the shell.
- if (WmShell::HasInstance())
- WmShell::Get()->RemoveShellObserver(this);
+ if (Shell::HasInstance())
+ Shell::GetInstance()->RemoveShellObserver(this);
}
void ScreenDimmer::SetDimming(bool should_dim) {
« no previous file with comments | « ash/common/wm/panels/panel_layout_manager.cc ('k') | ash/common/wm/workspace/workspace_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698