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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/display/chromeos/ozone/display_configurator_ozone.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/x11/display_configurator_x11.cc
diff --git a/ui/display/chromeos/x11/display_configurator_x11.cc b/ui/display/chromeos/x11/display_configurator_x11.cc
index 6e6b59fa41c362410733a4779109640e8188c2c2..8d8fa5a31c4df7049e9ec15fac842580525b0333 100644
--- a/ui/display/chromeos/x11/display_configurator_x11.cc
+++ b/ui/display/chromeos/x11/display_configurator_x11.cc
@@ -10,12 +10,16 @@
namespace ui {
-void DisplayConfigurator::PlatformInitialize() {
- InitializeDelegates(
- scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11()),
- scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
- scoped_ptr<TouchscreenDeviceManager>(
- new TouchscreenDeviceManagerX11()))));
+scoped_ptr<NativeDisplayDelegate>
+DisplayConfigurator::CreatePlatformNativeDisplayDelegate() {
+ return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateX11());
+}
+
+scoped_ptr<DisplayConfigurator::TouchscreenDelegate>
+DisplayConfigurator::CreatePlatformTouchscreenDelegate() {
+ return scoped_ptr<TouchscreenDelegate>(new TouchscreenDelegateImpl(
+ scoped_ptr<TouchscreenDeviceManager>(
+ new TouchscreenDeviceManagerX11())));
}
} // namespace ui
« 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