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

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

Issue 23922007: Merge the LinuxUI interface from its own .so into libviews.so. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/views.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_root_window_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_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>
11 #include <X11/Xutil.h> 11 #include <X11/Xutil.h>
12 12
13 #include "base/message_loop/message_pump_x11.h" 13 #include "base/message_loop/message_pump_x11.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "third_party/skia/include/core/SkPath.h" 16 #include "third_party/skia/include/core/SkPath.h"
17 #include "ui/aura/client/screen_position_client.h" 17 #include "ui/aura/client/screen_position_client.h"
18 #include "ui/aura/client/user_action_client.h" 18 #include "ui/aura/client/user_action_client.h"
19 #include "ui/aura/focus_manager.h" 19 #include "ui/aura/focus_manager.h"
20 #include "ui/aura/root_window.h" 20 #include "ui/aura/root_window.h"
21 #include "ui/aura/window_property.h" 21 #include "ui/aura/window_property.h"
22 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" 22 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
23 #include "ui/base/events/event_utils.h" 23 #include "ui/base/events/event_utils.h"
24 #include "ui/base/touch/touch_factory_x11.h" 24 #include "ui/base/touch/touch_factory_x11.h"
25 #include "ui/base/x/x11_util.h" 25 #include "ui/base/x/x11_util.h"
26 #include "ui/gfx/insets.h" 26 #include "ui/gfx/insets.h"
27 #include "ui/gfx/path_x11.h" 27 #include "ui/gfx/path_x11.h"
28 #include "ui/linux_ui/linux_ui.h"
29 #include "ui/native_theme/native_theme.h" 28 #include "ui/native_theme/native_theme.h"
30 #include "ui/views/corewm/compound_event_filter.h" 29 #include "ui/views/corewm/compound_event_filter.h"
31 #include "ui/views/corewm/corewm_switches.h" 30 #include "ui/views/corewm/corewm_switches.h"
32 #include "ui/views/corewm/cursor_manager.h" 31 #include "ui/views/corewm/cursor_manager.h"
33 #include "ui/views/corewm/focus_controller.h" 32 #include "ui/views/corewm/focus_controller.h"
34 #include "ui/views/ime/input_method.h" 33 #include "ui/views/ime/input_method.h"
34 #include "ui/views/linux_ui/linux_ui.h"
35 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.h" 35 #include "ui/views/widget/desktop_aura/desktop_cursor_loader_updater_aurax11.h"
36 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h" 36 #include "ui/views/widget/desktop_aura/desktop_dispatcher_client.h"
37 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h" 37 #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_aurax11.h"
38 #include "ui/views/widget/desktop_aura/desktop_focus_rules.h" 38 #include "ui/views/widget/desktop_aura/desktop_focus_rules.h"
39 #include "ui/views/widget/desktop_aura/desktop_layout_manager.h" 39 #include "ui/views/widget/desktop_aura/desktop_layout_manager.h"
40 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h" 40 #include "ui/views/widget/desktop_aura/desktop_native_cursor_manager.h"
41 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h" 41 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
42 #include "ui/views/widget/desktop_aura/desktop_root_window_host_observer_x11.h" 42 #include "ui/views/widget/desktop_aura/desktop_root_window_host_observer_x11.h"
43 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h" 43 #include "ui/views/widget/desktop_aura/desktop_screen_position_client.h"
44 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h" 44 #include "ui/views/widget/desktop_aura/x11_desktop_handler.h"
(...skipping 1270 matching lines...) Expand 10 before | Expand all | Expand 10 after
1315 internal::NativeWidgetDelegate* native_widget_delegate, 1315 internal::NativeWidgetDelegate* native_widget_delegate,
1316 DesktopNativeWidgetAura* desktop_native_widget_aura, 1316 DesktopNativeWidgetAura* desktop_native_widget_aura,
1317 const gfx::Rect& initial_bounds) { 1317 const gfx::Rect& initial_bounds) {
1318 return new DesktopRootWindowHostX11(native_widget_delegate, 1318 return new DesktopRootWindowHostX11(native_widget_delegate,
1319 desktop_native_widget_aura, 1319 desktop_native_widget_aura,
1320 initial_bounds); 1320 initial_bounds);
1321 } 1321 }
1322 1322
1323 // static 1323 // static
1324 ui::NativeTheme* DesktopRootWindowHost::GetNativeTheme(aura::Window* window) { 1324 ui::NativeTheme* DesktopRootWindowHost::GetNativeTheme(aura::Window* window) {
1325 const ui::LinuxUI* linux_ui = ui::LinuxUI::instance(); 1325 const views::LinuxUI* linux_ui = views::LinuxUI::instance();
1326 if (linux_ui) { 1326 if (linux_ui) {
1327 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1327 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1328 if (native_theme) 1328 if (native_theme)
1329 return native_theme; 1329 return native_theme;
1330 } 1330 }
1331 1331
1332 return ui::NativeTheme::instance(); 1332 return ui::NativeTheme::instance();
1333 } 1333 }
1334 1334
1335 } // namespace views 1335 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/views.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698