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

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

Issue 29883002: Attempt to re-land FocusManager removal from Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable test with note. Created 7 years, 2 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
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/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/message_loop/message_pump_x11.h" 14 #include "base/message_loop/message_pump_x11.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "third_party/skia/include/core/SkPath.h" 17 #include "third_party/skia/include/core/SkPath.h"
18 #include "ui/aura/client/screen_position_client.h" 18 #include "ui/aura/client/screen_position_client.h"
19 #include "ui/aura/client/user_action_client.h" 19 #include "ui/aura/client/user_action_client.h"
20 #include "ui/aura/focus_manager.h"
21 #include "ui/aura/root_window.h" 20 #include "ui/aura/root_window.h"
22 #include "ui/aura/window_property.h" 21 #include "ui/aura/window_property.h"
23 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h" 22 #include "ui/base/dragdrop/os_exchange_data_provider_aurax11.h"
24 #include "ui/base/x/x11_util.h" 23 #include "ui/base/x/x11_util.h"
25 #include "ui/events/event_utils.h" 24 #include "ui/events/event_utils.h"
26 #include "ui/events/x/device_data_manager.h" 25 #include "ui/events/x/device_data_manager.h"
27 #include "ui/events/x/touch_factory_x11.h" 26 #include "ui/events/x/touch_factory_x11.h"
28 #include "ui/gfx/insets.h" 27 #include "ui/gfx/insets.h"
29 #include "ui/gfx/path.h" 28 #include "ui/gfx/path.h"
30 #include "ui/gfx/path_x11.h" 29 #include "ui/gfx/path_x11.h"
(...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 if (linux_ui) { 1423 if (linux_ui) {
1425 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1424 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1426 if (native_theme) 1425 if (native_theme)
1427 return native_theme; 1426 return native_theme;
1428 } 1427 }
1429 1428
1430 return ui::NativeTheme::instance(); 1429 return ui::NativeTheme::instance();
1431 } 1430 }
1432 1431
1433 } // namespace views 1432 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_win.cc ('k') | ui/views/widget/desktop_aura/x11_desktop_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698