ui/ozone/public/ozone_platform.cc - Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/ozone/public/ozone_platform.cc

Issue 685793002: Move all event related devices from ui/events/ to ui/events/devices/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@internal-touchscreens

Patch Set: Fix gn build Created 6 years, 1 month 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

« ui/events/platform/x11/x11_hotplug_event_handler.cc ('K') | « ui/events/x/touch_factory_x11.cc ('k') | ui/platform_window/x11/x11_window.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "base/debug/trace_event.h"	6 #include "base/debug/trace_event.h"

7 #include "base/logging.h"	7 #include "base/logging.h"

8 #include "ui/events/device_data_manager.h"	8 #include "ui/events/devices/device_data_manager.h"

9 #include "ui/ozone/platform_object.h"	9 #include "ui/ozone/platform_object.h"

10 #include "ui/ozone/platform_selection.h"	10 #include "ui/ozone/platform_selection.h"

11 #include "ui/ozone/public/ozone_platform.h"	11 #include "ui/ozone/public/ozone_platform.h"

12 #include "ui/ozone/public/ozone_switches.h"	12 #include "ui/ozone/public/ozone_switches.h"

13	13

14 namespace ui {	14 namespace ui {

15	15

16 namespace {	16 namespace {

17	17

18 bool g_platform_initialized_ui = false;	18 bool g_platform_initialized_ui = false;

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 // TODO(spang): Currently need to leak this object.	72 // TODO(spang): Currently need to leak this object.

73 OzonePlatform* pl = platform.release();	73 OzonePlatform* pl = platform.release();

74 DCHECK_EQ(instance_, pl);	74 DCHECK_EQ(instance_, pl);

75 }	75 }

76 }	76 }

77	77

78 // static	78 // static

79 OzonePlatform* OzonePlatform::instance_;	79 OzonePlatform* OzonePlatform::instance_;

80	80

81 } // namespace ui	81 } // namespace ui

OLD	NEW