Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h |
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h |
index 9f4e0b7a9f3f7bbe8457ae78920926b289e22124..544f086603c026a0f0109e4cf666132ee17356e7 100644 |
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h |
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h |
@@ -85,11 +85,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 |
static void CleanUpWindowList(void (*func)(aura::Window* window)); |
// Disables event listening to make |dialog| modal. |
- std::unique_ptr<base::Closure> DisableEventListening(XID dialog); |
- |
- // Returns XID of dialog currently displayed. When it returns 0, |
- // there is no dialog on the host window. |
- XID GetModalDialog(); |
+ std::unique_ptr<base::Closure> DisableEventListening(); |
protected: |
// Overridden from DesktopWindowTreeHost: |
@@ -430,7 +426,7 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11 |
std::unique_ptr<aura::ScopedWindowTargeter> targeter_for_modal_; |
- XID modal_dialog_xid_; |
+ uint32_t modal_dialog_counter_; |
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; |
base::WeakPtrFactory<DesktopWindowTreeHostX11> weak_factory_; |