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

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

Issue 1233913009: Make File-Picker modal on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add a test case 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 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
(...skipping 10 matching lines...) Expand all
21 #include "ui/aura/window.h" 21 #include "ui/aura/window.h"
22 #include "ui/aura/window_event_dispatcher.h" 22 #include "ui/aura/window_event_dispatcher.h"
23 #include "ui/aura/window_property.h" 23 #include "ui/aura/window_property.h"
24 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" 24 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
25 #include "ui/base/hit_test.h" 25 #include "ui/base/hit_test.h"
26 #include "ui/base/x/x11_util.h" 26 #include "ui/base/x/x11_util.h"
27 #include "ui/events/devices/x11/device_data_manager_x11.h" 27 #include "ui/events/devices/x11/device_data_manager_x11.h"
28 #include "ui/events/devices/x11/device_list_cache_x11.h" 28 #include "ui/events/devices/x11/device_list_cache_x11.h"
29 #include "ui/events/devices/x11/touch_factory_x11.h" 29 #include "ui/events/devices/x11/touch_factory_x11.h"
30 #include "ui/events/event_utils.h" 30 #include "ui/events/event_utils.h"
31 #include "ui/events/null_event_targeter.h"
31 #include "ui/events/platform/platform_event_source.h" 32 #include "ui/events/platform/platform_event_source.h"
32 #include "ui/events/platform/x11/x11_event_source.h" 33 #include "ui/events/platform/x11/x11_event_source.h"
33 #include "ui/gfx/display.h" 34 #include "ui/gfx/display.h"
34 #include "ui/gfx/geometry/insets.h" 35 #include "ui/gfx/geometry/insets.h"
35 #include "ui/gfx/geometry/size_conversions.h" 36 #include "ui/gfx/geometry/size_conversions.h"
36 #include "ui/gfx/image/image_skia.h" 37 #include "ui/gfx/image/image_skia.h"
37 #include "ui/gfx/image/image_skia_rep.h" 38 #include "ui/gfx/image/image_skia_rep.h"
38 #include "ui/gfx/path.h" 39 #include "ui/gfx/path.h"
39 #include "ui/gfx/path_x11.h" 40 #include "ui/gfx/path_x11.h"
40 #include "ui/gfx/screen.h" 41 #include "ui/gfx/screen.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 use_native_frame_(false), 165 use_native_frame_(false),
165 should_maximize_after_map_(false), 166 should_maximize_after_map_(false),
166 use_argb_visual_(false), 167 use_argb_visual_(false),
167 drag_drop_client_(NULL), 168 drag_drop_client_(NULL),
168 native_widget_delegate_(native_widget_delegate), 169 native_widget_delegate_(native_widget_delegate),
169 desktop_native_widget_aura_(desktop_native_widget_aura), 170 desktop_native_widget_aura_(desktop_native_widget_aura),
170 content_window_(NULL), 171 content_window_(NULL),
171 window_parent_(NULL), 172 window_parent_(NULL),
172 custom_window_shape_(false), 173 custom_window_shape_(false),
173 urgency_hint_set_(false), 174 urgency_hint_set_(false),
175 modal_dialog_xid_(0),
174 close_widget_factory_(this) { 176 close_widget_factory_(this) {
175 } 177 }
176 178
177 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() { 179 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
178 window()->ClearProperty(kHostForRootWindow); 180 window()->ClearProperty(kHostForRootWindow);
179 aura::client::SetWindowMoveClient(window(), NULL); 181 aura::client::SetWindowMoveClient(window(), NULL);
180 desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this); 182 desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
181 DestroyDispatcher(); 183 DestroyDispatcher();
182 } 184 }
183 185
(...skipping 1842 matching lines...) Expand 10 before | Expand all | Expand 10 after
2026 return gfx::ToEnclosingRect(rect_in_dip); 2028 return gfx::ToEnclosingRect(rect_in_dip);
2027 } 2029 }
2028 2030
2029 gfx::Rect DesktopWindowTreeHostX11::ToPixelRect( 2031 gfx::Rect DesktopWindowTreeHostX11::ToPixelRect(
2030 const gfx::Rect& rect_in_dip) const { 2032 const gfx::Rect& rect_in_dip) const {
2031 gfx::RectF rect_in_pixels = rect_in_dip; 2033 gfx::RectF rect_in_pixels = rect_in_dip;
2032 GetRootTransform().TransformRect(&rect_in_pixels); 2034 GetRootTransform().TransformRect(&rect_in_pixels);
2033 return gfx::ToEnclosingRect(rect_in_pixels); 2035 return gfx::ToEnclosingRect(rect_in_pixels);
2034 } 2036 }
2035 2037
2038 const XID DesktopWindowTreeHostX11::GetModalDialog() {
2039 return modal_dialog_xid_;
2040 }
2041
2042 void DesktopWindowTreeHostX11::DisableEventListening(XID dialog) {
2043 DCHECK(dialog);
2044 DCHECK(!modal_dialog_xid_);
2045 modal_dialog_xid_ = dialog;
2046 // ScopedWindowTargeter is used to temporarily replace the event-targeter
2047 // with NullEventTargeter to make |dialog| modal.
2048 targeter_for_modal_.reset(new aura::ScopedWindowTargeter(window(),
2049 scoped_ptr<ui::EventTargeter>(new ui::NullEventTargeter)));
2050 }
2051
2052 void DesktopWindowTreeHostX11::EnableEventListening() {
2053 DCHECK(modal_dialog_xid_);
2054 modal_dialog_xid_ = 0;
2055 targeter_for_modal_.reset();
2056 }
2057
2036 //////////////////////////////////////////////////////////////////////////////// 2058 ////////////////////////////////////////////////////////////////////////////////
2037 // DesktopWindowTreeHost, public: 2059 // DesktopWindowTreeHost, public:
2038 2060
2039 // static 2061 // static
2040 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( 2062 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
2041 internal::NativeWidgetDelegate* native_widget_delegate, 2063 internal::NativeWidgetDelegate* native_widget_delegate,
2042 DesktopNativeWidgetAura* desktop_native_widget_aura) { 2064 DesktopNativeWidgetAura* desktop_native_widget_aura) {
2043 return new DesktopWindowTreeHostX11(native_widget_delegate, 2065 return new DesktopWindowTreeHostX11(native_widget_delegate,
2044 desktop_native_widget_aura); 2066 desktop_native_widget_aura);
2045 } 2067 }
2046 2068
2047 // static 2069 // static
2048 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { 2070 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) {
2049 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); 2071 const views::LinuxUI* linux_ui = views::LinuxUI::instance();
2050 if (linux_ui) { 2072 if (linux_ui) {
2051 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 2073 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
2052 if (native_theme) 2074 if (native_theme)
2053 return native_theme; 2075 return native_theme;
2054 } 2076 }
2055 2077
2056 return ui::NativeTheme::instance(); 2078 return ui::NativeTheme::instance();
2057 } 2079 }
2058 2080
2059 } // namespace views 2081 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698