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

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 WidgetObserver to know when the browser window becomes inactive Created 5 years, 3 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 11 matching lines...) Expand all
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/ime/input_method.h" 26 #include "ui/base/ime/input_method.h"
27 #include "ui/base/x/x11_util.h" 27 #include "ui/base/x/x11_util.h"
28 #include "ui/events/devices/x11/device_data_manager_x11.h" 28 #include "ui/events/devices/x11/device_data_manager_x11.h"
29 #include "ui/events/devices/x11/device_list_cache_x11.h" 29 #include "ui/events/devices/x11/device_list_cache_x11.h"
30 #include "ui/events/devices/x11/touch_factory_x11.h" 30 #include "ui/events/devices/x11/touch_factory_x11.h"
31 #include "ui/events/event_utils.h" 31 #include "ui/events/event_utils.h"
32 #include "ui/events/null_event_targeter.h"
32 #include "ui/events/platform/platform_event_source.h" 33 #include "ui/events/platform/platform_event_source.h"
33 #include "ui/events/platform/x11/x11_event_source.h" 34 #include "ui/events/platform/x11/x11_event_source.h"
34 #include "ui/gfx/display.h" 35 #include "ui/gfx/display.h"
35 #include "ui/gfx/geometry/insets.h" 36 #include "ui/gfx/geometry/insets.h"
36 #include "ui/gfx/geometry/size_conversions.h" 37 #include "ui/gfx/geometry/size_conversions.h"
37 #include "ui/gfx/image/image_skia.h" 38 #include "ui/gfx/image/image_skia.h"
38 #include "ui/gfx/image/image_skia_rep.h" 39 #include "ui/gfx/image/image_skia_rep.h"
39 #include "ui/gfx/path.h" 40 #include "ui/gfx/path.h"
40 #include "ui/gfx/path_x11.h" 41 #include "ui/gfx/path_x11.h"
41 #include "ui/gfx/screen.h" 42 #include "ui/gfx/screen.h"
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 use_native_frame_(false), 166 use_native_frame_(false),
166 should_maximize_after_map_(false), 167 should_maximize_after_map_(false),
167 use_argb_visual_(false), 168 use_argb_visual_(false),
168 drag_drop_client_(NULL), 169 drag_drop_client_(NULL),
169 native_widget_delegate_(native_widget_delegate), 170 native_widget_delegate_(native_widget_delegate),
170 desktop_native_widget_aura_(desktop_native_widget_aura), 171 desktop_native_widget_aura_(desktop_native_widget_aura),
171 content_window_(NULL), 172 content_window_(NULL),
172 window_parent_(NULL), 173 window_parent_(NULL),
173 custom_window_shape_(false), 174 custom_window_shape_(false),
174 urgency_hint_set_(false), 175 urgency_hint_set_(false),
176 modal_dialog_xid_(0),
175 close_widget_factory_(this) { 177 close_widget_factory_(this) {
176 } 178 }
177 179
178 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() { 180 DesktopWindowTreeHostX11::~DesktopWindowTreeHostX11() {
179 window()->ClearProperty(kHostForRootWindow); 181 window()->ClearProperty(kHostForRootWindow);
180 aura::client::SetWindowMoveClient(window(), NULL); 182 aura::client::SetWindowMoveClient(window(), NULL);
181 desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this); 183 desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this);
182 DestroyDispatcher(); 184 DestroyDispatcher();
183 } 185 }
184 186
(...skipping 1847 matching lines...) Expand 10 before | Expand all | Expand 10 after
2032 return gfx::ToEnclosingRect(rect_in_dip); 2034 return gfx::ToEnclosingRect(rect_in_dip);
2033 } 2035 }
2034 2036
2035 gfx::Rect DesktopWindowTreeHostX11::ToPixelRect( 2037 gfx::Rect DesktopWindowTreeHostX11::ToPixelRect(
2036 const gfx::Rect& rect_in_dip) const { 2038 const gfx::Rect& rect_in_dip) const {
2037 gfx::RectF rect_in_pixels = gfx::RectF(rect_in_dip); 2039 gfx::RectF rect_in_pixels = gfx::RectF(rect_in_dip);
2038 GetRootTransform().TransformRect(&rect_in_pixels); 2040 GetRootTransform().TransformRect(&rect_in_pixels);
2039 return gfx::ToEnclosingRect(rect_in_pixels); 2041 return gfx::ToEnclosingRect(rect_in_pixels);
2040 } 2042 }
2041 2043
2044 const XID DesktopWindowTreeHostX11::GetModalDialog() {
2045 return modal_dialog_xid_;
2046 }
2047
2048 void DesktopWindowTreeHostX11::DisableEventListening(XID dialog) {
2049 DCHECK(dialog);
2050 DCHECK(!modal_dialog_xid_);
2051 modal_dialog_xid_ = dialog;
2052 // ScopedWindowTargeter is used to temporarily replace the event-targeter
2053 // with NullEventTargeter to make |dialog| modal.
2054 targeter_for_modal_.reset(new aura::ScopedWindowTargeter(window(),
2055 scoped_ptr<ui::EventTargeter>(new ui::NullEventTargeter)));
2056 }
2057
2058 void DesktopWindowTreeHostX11::EnableEventListening() {
2059 DCHECK(modal_dialog_xid_);
2060 modal_dialog_xid_ = 0;
2061 targeter_for_modal_.reset();
2062 }
2063
2042 //////////////////////////////////////////////////////////////////////////////// 2064 ////////////////////////////////////////////////////////////////////////////////
2043 // DesktopWindowTreeHost, public: 2065 // DesktopWindowTreeHost, public:
2044 2066
2045 // static 2067 // static
2046 DesktopWindowTreeHost* DesktopWindowTreeHost::Create( 2068 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
2047 internal::NativeWidgetDelegate* native_widget_delegate, 2069 internal::NativeWidgetDelegate* native_widget_delegate,
2048 DesktopNativeWidgetAura* desktop_native_widget_aura) { 2070 DesktopNativeWidgetAura* desktop_native_widget_aura) {
2049 return new DesktopWindowTreeHostX11(native_widget_delegate, 2071 return new DesktopWindowTreeHostX11(native_widget_delegate,
2050 desktop_native_widget_aura); 2072 desktop_native_widget_aura);
2051 } 2073 }
2052 2074
2053 // static 2075 // static
2054 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) { 2076 ui::NativeTheme* DesktopWindowTreeHost::GetNativeTheme(aura::Window* window) {
2055 const views::LinuxUI* linux_ui = views::LinuxUI::instance(); 2077 const views::LinuxUI* linux_ui = views::LinuxUI::instance();
2056 if (linux_ui) { 2078 if (linux_ui) {
2057 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 2079 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
2058 if (native_theme) 2080 if (native_theme)
2059 return native_theme; 2081 return native_theme;
2060 } 2082 }
2061 2083
2062 return ui::NativeTheme::instance(); 2084 return ui::NativeTheme::instance();
2063 } 2085 }
2064 2086
2065 } // namespace views 2087 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698