ui/display/chromeos/ozone/display_configurator_ozone.cc - Issue 379233005: ozone: Move public files to ui/ozone/public & update public DEPS

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/display/chromeos/ozone/display_configurator_ozone.cc

Issue 379233005: ozone: Move public files to ui/ozone/public & update public DEPS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 5 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/display/chromeos/ozone/DEPS ('k') | ui/gl/DEPS » ('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 "ui/display/chromeos/display_configurator.h"	5 #include "ui/display/chromeos/display_configurator.h"

6	6

7 #include "ui/display/chromeos/touchscreen_delegate_impl.h"	7 #include "ui/display/chromeos/touchscreen_delegate_impl.h"

8 #include "ui/display/types/chromeos/native_display_delegate.h"	8 #include "ui/display/types/chromeos/native_display_delegate.h"

9 #include "ui/display/types/chromeos/touchscreen_device_manager.h"	9 #include "ui/display/types/chromeos/touchscreen_device_manager.h"

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

11	11

12 namespace ui {	12 namespace ui {

13	13

14 scoped_ptr<NativeDisplayDelegate>	14 scoped_ptr<NativeDisplayDelegate>

15 DisplayConfigurator::CreatePlatformNativeDisplayDelegate() {	15 DisplayConfigurator::CreatePlatformNativeDisplayDelegate() {

16 return ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();	16 return ui::OzonePlatform::GetInstance()->CreateNativeDisplayDelegate();

17 }	17 }

18	18

19 scoped_ptr<DisplayConfigurator::TouchscreenDelegate>	19 scoped_ptr<DisplayConfigurator::TouchscreenDelegate>

20 DisplayConfigurator::CreatePlatformTouchscreenDelegate() {	20 DisplayConfigurator::CreatePlatformTouchscreenDelegate() {

21 return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(	21 return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(

22 ui::OzonePlatform::GetInstance()->CreateTouchscreenDeviceManager()));	22 ui::OzonePlatform::GetInstance()->CreateTouchscreenDeviceManager()));

23 }	23 }

24	24

25 } // namespace ui	25 } // namespace ui

OLD	NEW