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

Unified Diff: ash/root_window_controller.cc

Issue 2320273002: Refactors DimWindow and moves to ash/common (Closed)
Patch Set: git add wm_window 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
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 0154b0cd9cfaa7692013b4691a0a6895a4ec2965..a077c7a61543892758fc7698aba575e204fc9341 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -410,7 +410,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.
@@ -763,9 +763,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);

Powered by Google App Engine
This is Rietveld 408576698