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

Unified Diff: components/mus/ws/server_window.h

Issue 1949603002: Revert of mus: Enable system modal windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « components/mus/ws/modal_window_controller.cc ('k') | components/mus/ws/server_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/server_window.h
diff --git a/components/mus/ws/server_window.h b/components/mus/ws/server_window.h
index 2d7070a39410d677e55246a8764a3383ada81c07..a518ff085e40a8893142a183e13539645a4e86ee 100644
--- a/components/mus/ws/server_window.h
+++ b/components/mus/ws/server_window.h
@@ -100,8 +100,7 @@
ServerWindow* GetChildWindow(const WindowId& id);
// Transient window management.
- // Adding transient child fails if the child window is modal to system.
- bool AddTransientWindow(ServerWindow* child);
+ void AddTransientWindow(ServerWindow* child);
void RemoveTransientWindow(ServerWindow* child);
ServerWindow* transient_parent() { return transient_parent_; }
@@ -111,6 +110,17 @@
bool is_modal() const { return is_modal_; }
void SetModal();
+
+ bool IsBlockedByModalWindow() const;
+
+ // Returns the window that events targeted to this window should be retargeted
+ // to; according to modal windows. If any modal window is blocking this
+ // window, returns the topmost one; otherwise, returns this window.
+ const ServerWindow* GetModalTarget() const;
+ ServerWindow* GetModalTarget() {
+ return const_cast<ServerWindow*>(
+ static_cast<const ServerWindow*>(this)->GetModalTarget());
+ }
// Returns true if this contains |window| or is |window|.
bool Contains(const ServerWindow* window) const;
« no previous file with comments | « components/mus/ws/modal_window_controller.cc ('k') | components/mus/ws/server_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698