| 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 f133af35d5c350b5e2f6a1697805f536a77124d0..a56deb7fc9f851beedb554a21c8019a0eee2599a 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,7 +28,6 @@
|
| #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 +171,6 @@
|
| window_parent_(NULL),
|
| custom_window_shape_(false),
|
| urgency_hint_set_(false),
|
| - modal_dialog_xid_(0),
|
| close_widget_factory_(this) {
|
| }
|
|
|
| @@ -2035,25 +2033,6 @@
|
| return gfx::ToEnclosingRect(rect_in_pixels);
|
| }
|
|
|
| -const XID DesktopWindowTreeHostX11::GetModalDialog() {
|
| - return modal_dialog_xid_;
|
| -}
|
| -
|
| -void DesktopWindowTreeHostX11::DisableEventListening(XID 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:
|
|
|
|
|