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

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

Issue 1594973009: Revert of Make File-Picker modal on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge-fix Created 4 years, 11 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.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 f7495f0a2fce6bf4c2abb9161dd107de56a524b9..e2fb724b9146b073cbb06b8b2d997c12ba6c4888 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
@@ -30,7 +30,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"
@@ -176,7 +175,6 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
custom_window_shape_(false),
urgency_hint_set_(false),
activatable_(true),
- modal_dialog_xid_(0),
close_widget_factory_(this) {
}
@@ -1527,8 +1525,7 @@ void DesktopWindowTreeHostX11::DispatchTouchEvent(ui::TouchEvent* event) {
}
void DesktopWindowTreeHostX11::DispatchKeyEvent(ui::KeyEvent* event) {
- if (native_widget_delegate_->AsWidget()->IsActive())
- GetInputMethod()->DispatchKeyEvent(event);
+ GetInputMethod()->DispatchKeyEvent(event);
}
void DesktopWindowTreeHostX11::ConvertEventToDifferentHost(
@@ -2021,26 +2018,6 @@ gfx::Rect DesktopWindowTreeHostX11::ToPixelRect(
return gfx::ToEnclosingRect(rect_in_pixels);
}
-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:
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h ('k') | ui/views/widget/desktop_aura/x11_desktop_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698