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

Side by Side Diff: ui/platform_window/x11/x11_window.cc

Issue 1390883003: aura: Unify WindowTreeHost for some platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missing factories Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/platform_window/x11/x11_window.h" 5 #include "ui/platform_window/x11/x11_window.h"
6 6
7 #include <X11/extensions/XInput2.h> 7 #include <X11/extensions/XInput2.h>
8 #include <X11/Xatom.h> 8 #include <X11/Xatom.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 "ui/events/devices/x11/touch_factory_x11.h" 12 #include "ui/events/devices/x11/touch_factory_x11.h"
13 #include "ui/events/event.h" 13 #include "ui/events/event.h"
14 #include "ui/events/event_utils.h" 14 #include "ui/events/event_utils.h"
15 #include "ui/events/platform/platform_event_dispatcher.h" 15 #include "ui/events/platform/platform_event_dispatcher.h"
16 #include "ui/events/platform/platform_event_source.h" 16 #include "ui/events/platform/platform_event_source.h"
17 #include "ui/events/platform/x11/x11_event_source.h" 17 #include "ui/events/platform/x11/x11_event_source.h"
18 #include "ui/gfx/geometry/rect.h" 18 #include "ui/gfx/geometry/rect.h"
19 #include "ui/gfx/x/x11_atom_cache.h" 19 #include "ui/gfx/x/x11_atom_cache.h"
20 #include "ui/gfx/x/x11_types.h" 20 #include "ui/gfx/x/x11_types.h"
21 #include "ui/platform_window/platform_window_delegate.h" 21 #include "ui/platform_window/platform_window_delegate.h"
22 22
23 namespace ui { 23 namespace ui {
24 24
25 // static
26 scoped_ptr<PlatformWindow> PlatformWindow::Create(
27 PlatformWindowDelegate* delegate,
28 const gfx::Rect& bounds) {
29 return new X11Window(delegate);
30 }
31
25 namespace { 32 namespace {
26 33
27 const char* kAtomsToCache[] = { 34 const char* kAtomsToCache[] = {
28 "WM_DELETE_WINDOW", 35 "WM_DELETE_WINDOW",
29 "_NET_WM_PING", 36 "_NET_WM_PING",
30 "_NET_WM_PID", 37 "_NET_WM_PID",
31 NULL 38 NULL
32 }; 39 };
33 40
34 XID FindXEventTarget(XEvent* xevent) { 41 XID FindXEventTarget(XEvent* xevent) {
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 } 382 }
376 383
377 namespace test { 384 namespace test {
378 385
379 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) { 386 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
380 g_override_redirect = override_redirect; 387 g_override_redirect = override_redirect;
381 } 388 }
382 389
383 } // namespace test 390 } // namespace test
384 } // namespace ui 391 } // namespace ui
OLDNEW
« ui/aura/window_tree_host_platform.h ('K') | « ui/platform_window/win/win_window.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698