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

Unified Diff: ash/root_window_controller.cc

Issue 2320273002: Refactors DimWindow and moves to ash/common (Closed)
Patch Set: feedback and member initializer ordering Created 4 years, 3 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/mus/bridge/wm_window_mus.cc ('k') | ash/wm/dim_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index d718d653ca8358c49c4c1ed74d9e626b75083bc1..d527e5f841dbb38a43233719a6ce3d5406dd8910 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -394,7 +394,7 @@ bool RootWindowController::CanWindowReceiveEvents(aura::Window* window) {
modal_layout_manager = static_cast<SystemModalContainerLayoutManager*>(
modal_container->layout_manager());
- if (modal_layout_manager->has_modal_background())
+ if (modal_layout_manager->has_window_dimmer())
blocking_container = modal_container;
else
modal_container = nullptr; // Don't check modal dialogs.
@@ -733,9 +733,9 @@ void RootWindowController::Init(RootWindowType root_window_type,
InitTouchHuds();
if (Shell::GetPrimaryRootWindowController()
- ->GetSystemModalLayoutManager(NULL)
- ->has_modal_background()) {
- GetSystemModalLayoutManager(NULL)->CreateModalBackground();
+ ->GetSystemModalLayoutManager(nullptr)
+ ->has_window_dimmer()) {
+ GetSystemModalLayoutManager(nullptr)->CreateModalBackground();
}
WmShell::Get()->AddShellObserver(this);
« no previous file with comments | « ash/mus/bridge/wm_window_mus.cc ('k') | ash/wm/dim_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698