Make File-Picker modal on Linux

ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

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 94a1cc2c8bce20bbdc56a50ca37debbb241b9249..bf6699c959ffdd5c350511231f3542db231e2333 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
@@ -29,6 +29,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,6 +173,7 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
       window_parent_(NULL),
       custom_window_shape_(false),
       urgency_hint_set_(false),
+      modal_dialog_xid_(0),
       close_widget_factory_(this) {
 }
 
@@ -1520,7 +1522,9 @@ void DesktopWindowTreeHostX11::DispatchTouchEvent(ui::TouchEvent* event) {
 }
 
 void DesktopWindowTreeHostX11::DispatchKeyEvent(ui::KeyEvent* event) {
-  GetInputMethod()->DispatchKeyEvent(event);
+  views::Widget* widget = native_widget_delegate_->AsWidget();

[msw, 2015/09/16 23:10:04]

nit: inline this in the if statement below.

[joone, 2015/09/16 23:40:31]

Done.

+  if (widget->IsActive())
+    GetInputMethod()->DispatchKeyEvent(event);

[joone, 2015/09/16 22:42:55]

We don't need to feed key events to the input method when the browser window
lost focus.

[7141:7141:0915/183425:FATAL:input_method_auralinux.cc(48)] Check failed:
system_toplevel_window_focused().
#0 0x0000004c31e1 __interceptor_backtrace
#1 0x000002d924e8 base::debug::StackTrace::StackTrace()
#2 0x000002dd4ff7 logging::LogMessage::~LogMessage()
#3 0x000004f96725 ui::InputMethodAuraLinux::DispatchKeyEvent()
#4 0x000002457cbf views::DesktopWindowTreeHostX11::DispatchEvent()
#5 0x00000245a480 views::DesktopWindowTreeHostX11::DispatchEvent()
#6 0x000003c4c55d ui::PlatformEventSource::DispatchEvent()
#7 0x000003c4f875 ui::X11EventSource::DispatchEvent()
#8 0x000003c4f351 ui::X11EventSource::DispatchXEvents()
#9 0x000003c501cc ui::(anonymous namespace)::XSourceDispatch()
#10 0x7f49a4935d13 g_main_context_dispatch

[msw, 2015/09/16 23:10:04]

This seems reasonable, but other reviewers on the CL may know better.

[joone, 2015/09/16 23:40:31]

Acknowledged.

 }
 
 void DesktopWindowTreeHostX11::ConvertEventToDifferentHost(
@@ -2039,6 +2043,26 @@ gfx::Rect DesktopWindowTreeHostX11::ToPixelRect(
   return gfx::ToEnclosingRect(rect_in_pixels);
 }
 
+const XID DesktopWindowTreeHostX11::GetModalDialog() {
+  return modal_dialog_xid_;
+}
+
+void DesktopWindowTreeHostX11::DisableEventListening(XID dialog) {
+  DCHECK(dialog);
+  DCHECK(!modal_dialog_xid_);
+  modal_dialog_xid_ = dialog;
+  // ScopedWindowTargeter is used to temporarily replace the event-targeter
+  // with NullEventTargeter to make |dialog| modal.
+  targeter_for_modal_.reset(new aura::ScopedWindowTargeter(window(),
+      scoped_ptr<ui::EventTargeter>(new ui::NullEventTargeter)));
+}
+
+void DesktopWindowTreeHostX11::EnableEventListening() {
+  DCHECK(modal_dialog_xid_);
+  modal_dialog_xid_ = 0;
+  targeter_for_modal_.reset();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopWindowTreeHost, public: