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

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

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.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 10361522a0c79f9446c85ea4a5ca846242b5a0d9..759194f6b52c03be388b45dee939a8f14db0d312 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
@@ -15,7 +15,6 @@
#include "base/macros.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"
@@ -88,16 +87,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
// internal list of open windows.
static void CleanUpWindowList(void (*func)(aura::Window* window));
- // Disables event listening to make |dialog| modal.
- void DisableEventListening(XID dialog);
-
- // Enables event listening after closing |dialog|.
- void EnableEventListening();
-
- // Returns XID of dialog currently displayed. When it returns 0,
- // there is no dialog on the host window.
- XID GetModalDialog();
-
protected:
// Overridden from DesktopWindowTreeHost:
void Init(aura::Window* content_window,
@@ -360,10 +349,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
base::CancelableCallback<void()> delayed_resize_task_;
- scoped_ptr<aura::ScopedWindowTargeter> targeter_for_modal_;
-
- XID modal_dialog_xid_;
-
base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);

Powered by Google App Engine
This is Rietveld 408576698