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

Side by Side Diff: ui/display/chromeos/x11/display_configurator_x11.cc

Issue 383463002: Don't bother asking the platform for the delegates if they are already set (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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/display_configurator_ozone.cc ('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 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/chromeos/x11/native_display_delegate_x11.h" 8 #include "ui/display/chromeos/x11/native_display_delegate_x11.h"
9 #include "ui/display/chromeos/x11/touchscreen_device_manager_x11.h" 9 #include "ui/display/chromeos/x11/touchscreen_device_manager_x11.h"
10 10
11 namespace ui { 11 namespace ui {
12 12
13 void DisplayConfigurator::PlatformInitialize() { 13 scoped_ptr<NativeDisplayDelegate>
14 InitializeDelegates( 14 DisplayConfigurator::CreatePlatformNativeDisplayDelegate() {
15 scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11()), 15 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11());
16 scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl( 16 }
17 scoped_ptr<TouchscreenDeviceManager>( 17
18 new TouchscreenDeviceManagerX11())))); 18 scoped_ptr<DisplayConfigurator::TouchscreenDelegate>
19 DisplayConfigurator::CreatePlatformTouchscreenDelegate() {
20 return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
21 scoped_ptr<TouchscreenDeviceManager>(
22 new TouchscreenDeviceManagerX11())));
19 } 23 }
20 24
21 } // namespace ui 25 } // namespace ui
OLDNEW
« no previous file with comments | « ui/display/chromeos/ozone/display_configurator_ozone.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698