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

Unified Diff: ash/shell_port.cc

Issue 2919533002: [mus+ash] removes WmWindow, wm_window.h and wm_window.cc (Closed)
Patch Set: [mus+ash] removes WmWindow, wm_window.h and wm_window.cc (fixes build) 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell_port.h ('k') | ash/wm_transient_window_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_port.cc
diff --git a/ash/shell_port.cc b/ash/shell_port.cc
index f6463630f757ec5f8b474dab9f8bc1e3fe765879..ecb13fa318f395fd8fce7e5b7941807752970644 100644
--- a/ash/shell_port.cc
+++ b/ash/shell_port.cc
@@ -15,10 +15,11 @@
#include "ash/shell_delegate.h"
#include "ash/wm/root_window_finder.h"
#include "ash/wm/system_modal_container_layout_manager.h"
-#include "ash/wm_window.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/memory/ptr_util.h"
+#include "ui/aura/client/aura_constants.h"
+#include "ui/aura/window.h"
#include "ui/display/display.h"
namespace ash {
@@ -79,13 +80,15 @@ bool ShellPort::IsSystemModalWindowOpen() {
// Traverse all system modal containers, and find its direct child window
// with "SystemModal" setting, and visible.
- for (WmWindow* root : GetAllRootWindows()) {
- WmWindow* system_modal =
- root->GetChildByShellWindowId(kShellWindowId_SystemModalContainer);
+ for (aura::Window* root : GetAllRootWindows()) {
+ aura::Window* system_modal =
+ root->GetChildById(kShellWindowId_SystemModalContainer);
if (!system_modal)
continue;
- for (const WmWindow* child : system_modal->GetChildren()) {
- if (child->IsSystemModal() && child->GetTargetVisibility()) {
+ for (const aura::Window* child : system_modal->children()) {
+ if (child->GetProperty(aura::client::kModalKey) ==
+ ui::MODAL_TYPE_SYSTEM &&
+ child->layer()->GetTargetVisibility()) {
return true;
}
}
« no previous file with comments | « ash/shell_port.h ('k') | ash/wm_transient_window_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698