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

Unified Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Issue 1045443002: Make File-Picker modal on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 5 years, 6 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: 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 641c5e8e10debf4780f22ee500bcff7cf844defb..53a4aa161f786f2a2486cc5cf46a0bc6347e8eeb 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
@@ -13,6 +13,7 @@
#include "base/cancelable_callback.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
+#include "ui/aura/scoped_window_targeter.h"
#include "ui/aura/window_tree_host.h"
#include "ui/base/cursor/cursor_loader_x11.h"
#include "ui/events/platform/platform_event_dispatcher.h"
@@ -84,6 +85,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// Deallocates the internal list of open windows.
static void CleanUpWindowList();
+ XID GetModalDialog();
+ void EnableEventListening();
+ void DisableEventListening(XID dialog);
sadrul 2015/06/30 17:30:56 document
joone 2015/07/01 03:16:06 Done.
+
protected:
// Overridden from DesktopWindowTreeHost:
void Init(aura::Window* content_window,
@@ -347,6 +352,10 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
+ scoped_ptr<aura::ScopedWindowTargeter> scoped_targeter_;
sadrul 2015/06/30 17:30:56 Call this |targeter_for_modal_| (or something like
joone 2015/07/01 03:16:06 Done.
+
+ XID modal_dialog_xid_;
+
DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
};

Powered by Google App Engine
This is Rietveld 408576698