Index: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
index c9d3f3a67b037de6fff4c1dd5ce8ba40d5a23d95..03f4685fdaa139f6e10faaf309182bb9de6758d7 100644 |
--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
+++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc |
@@ -28,6 +28,7 @@ |
#include "ui/events/devices/x11/device_list_cache_x11.h" |
#include "ui/events/devices/x11/touch_factory_x11.h" |
#include "ui/events/event_utils.h" |
+#include "ui/events/null_event_targeter.h" |
#include "ui/events/platform/platform_event_source.h" |
#include "ui/events/platform/x11/x11_event_source.h" |
#include "ui/gfx/display.h" |
@@ -172,7 +173,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11( |
window_parent_(NULL), |
custom_window_shape_(false), |
urgency_hint_set_(false), |
- close_widget_factory_(this) { |
+ close_widget_factory_(this), |
+ modal_dialog_xid_(0) { |
} |
DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() { |
@@ -2027,6 +2029,23 @@ gfx::Rect DesktopWindowTreeHostX11::ToPixelRect( |
return gfx::ToEnclosingRect(rect_in_pixels); |
} |
+XID DesktopWindowTreeHostX11::GetModalDialog() { |
+ return modal_dialog_xid_; |
+} |
+ |
+void DesktopWindowTreeHostX11::DisableEventListening(XID dialog) { |
+ modal_dialog_xid_ = dialog; |
sadrul
2015/06/30 17:30:56
DCHECK here that modal_dialog_xid_ is None.
joone
2015/07/01 03:16:06
Done.
|
+ // ScopedWindowTargeter is used to temporarily replace the event-targeter |
+ // with NullEventTargeter to make the dialog modal. |
+ scoped_targeter_.reset(new aura::ScopedWindowTargeter(window(), |
+ scoped_ptr<ui::EventTargeter>(new ui::NullEventTargeter))); |
+} |
+ |
+void DesktopWindowTreeHostX11::EnableEventListening() { |
+ modal_dialog_xid_ = 0; |
sadrul
2015/06/30 17:30:56
DCHECK here that modal_dialog_xid_ != None
joone
2015/07/01 03:16:06
Done.
|
+ scoped_targeter_.reset(); |
+} |
+ |
//////////////////////////////////////////////////////////////////////////////// |
// DesktopWindowTreeHost, public: |