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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h

Issue 1045443002: Make File-Picker modal on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed modal_dialog_xid_ in X11DesktopHandler and fixed others. Created 5 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
7 7
8 #include <X11/extensions/shape.h> 8 #include <X11/extensions/shape.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #include <X11/Xutil.h> 10 #include <X11/Xutil.h>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/cancelable_callback.h" 13 #include "base/cancelable_callback.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "ui/aura/scoped_window_targeter.h"
16 #include "ui/aura/window_tree_host.h" 17 #include "ui/aura/window_tree_host.h"
17 #include "ui/base/cursor/cursor_loader_x11.h" 18 #include "ui/base/cursor/cursor_loader_x11.h"
18 #include "ui/events/platform/platform_event_dispatcher.h" 19 #include "ui/events/platform/platform_event_dispatcher.h"
19 #include "ui/gfx/geometry/insets.h" 20 #include "ui/gfx/geometry/insets.h"
20 #include "ui/gfx/geometry/rect.h" 21 #include "ui/gfx/geometry/rect.h"
21 #include "ui/gfx/geometry/size.h" 22 #include "ui/gfx/geometry/size.h"
22 #include "ui/gfx/x/x11_atom_cache.h" 23 #include "ui/gfx/x/x11_atom_cache.h"
23 #include "ui/views/views_export.h" 24 #include "ui/views/views_export.h"
24 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h" 25 #include "ui/views/widget/desktop_aura/desktop_window_tree_host.h"
25 26
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 void AddObserver(views::DesktopWindowTreeHostObserverX11* observer); 79 void AddObserver(views::DesktopWindowTreeHostObserverX11* observer);
79 void RemoveObserver(views::DesktopWindowTreeHostObserverX11* observer); 80 void RemoveObserver(views::DesktopWindowTreeHostObserverX11* observer);
80 81
81 // Swaps the current handler for events in the non client view with |handler|. 82 // Swaps the current handler for events in the non client view with |handler|.
82 void SwapNonClientEventHandler(scoped_ptr<ui::EventHandler> handler); 83 void SwapNonClientEventHandler(scoped_ptr<ui::EventHandler> handler);
83 84
84 // Runs the |func| callback for each content-window, and deallocates the 85 // Runs the |func| callback for each content-window, and deallocates the
85 // internal list of open windows. 86 // internal list of open windows.
86 static void CleanUpWindowList(void (*func)(aura::Window* window)); 87 static void CleanUpWindowList(void (*func)(aura::Window* window));
87 88
89 // Called by SelectFileDialogImplGTK to disable event listening to make
90 // a Gtk file dialog modal
91 void DisableEventListening(XID dialog);
sadrul 2015/07/01 03:58:14 Document |dialog|, and what the function is suppos
joone 2015/07/01 21:40:37 Done.
92
93 // Called by SelectFileDialogImplGTK to enable event listening after closing
94 // the Gtk file dialog.
95 void EnableEventListening();
96
97 // Called by X11DesktopHandler to get XID of Gtk file dialog in order to
98 // set focus to the Gtk file dialog.
99 XID GetModalDialog();
100
88 protected: 101 protected:
89 // Overridden from DesktopWindowTreeHost: 102 // Overridden from DesktopWindowTreeHost:
90 void Init(aura::Window* content_window, 103 void Init(aura::Window* content_window,
91 const Widget::InitParams& params) override; 104 const Widget::InitParams& params) override;
92 void OnNativeWidgetCreated(const Widget::InitParams& params) override; 105 void OnNativeWidgetCreated(const Widget::InitParams& params) override;
93 scoped_ptr<corewm::Tooltip> CreateTooltip() override; 106 scoped_ptr<corewm::Tooltip> CreateTooltip() override;
94 scoped_ptr<aura::client::DragDropClient> CreateDragDropClient( 107 scoped_ptr<aura::client::DragDropClient> CreateDragDropClient(
95 DesktopNativeCursorManager* cursor_manager) override; 108 DesktopNativeCursorManager* cursor_manager) override;
96 void Close() override; 109 void Close() override;
97 void CloseNow() override; 110 void CloseNow() override;
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 base::string16 window_title_; 352 base::string16 window_title_;
340 353
341 // Whether we currently are flashing our frame. This feature is implemented 354 // Whether we currently are flashing our frame. This feature is implemented
342 // by setting the urgency hint with the window manager, which can draw 355 // by setting the urgency hint with the window manager, which can draw
343 // attention to the window or completely ignore the hint. We stop flashing 356 // attention to the window or completely ignore the hint. We stop flashing
344 // the frame when |xwindow_| gains focus or handles a mouse button event. 357 // the frame when |xwindow_| gains focus or handles a mouse button event.
345 bool urgency_hint_set_; 358 bool urgency_hint_set_;
346 359
347 base::CancelableCallback<void()> delayed_resize_task_; 360 base::CancelableCallback<void()> delayed_resize_task_;
348 361
362 scoped_ptr<aura::ScopedWindowTargeter> targeter_for_modal_;
363
364 XID modal_dialog_xid_;
365
349 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_; 366 base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
350 367
351 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11); 368 DISALLOW_COPY_AND_ASSIGN(DesktopWindowTreeHostX11);
352 }; 369 };
353 370
354 } // namespace views 371 } // namespace views
355 372
356 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_ 373 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_WINDOW_TREE_HOST_X11_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698