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

Unified Diff: ui/display/chromeos/display_configurator.cc

Issue 230763004: Split ui/display types into separate module and have Ozone depend on it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
Index: ui/display/chromeos/display_configurator.cc
diff --git a/ui/display/chromeos/display_configurator.cc b/ui/display/chromeos/display_configurator.cc
index 8a8885a5e032041822c77df907b9f93e19ef5afb..03bd42763933f5374c07681886638836f03493f5 100644
--- a/ui/display/chromeos/display_configurator.cc
+++ b/ui/display/chromeos/display_configurator.cc
@@ -11,14 +11,14 @@
#include "base/strings/stringprintf.h"
#include "base/sys_info.h"
#include "base/time/time.h"
-#include "ui/display/chromeos/display_mode.h"
-#include "ui/display/chromeos/display_snapshot.h"
-#include "ui/display/chromeos/native_display_delegate.h"
#include "ui/display/display_switches.h"
+#include "ui/display/types/chromeos/display_mode.h"
+#include "ui/display/types/chromeos/display_snapshot.h"
+#include "ui/display/types/chromeos/native_display_delegate.h"
#if defined(USE_OZONE)
-#include "ui/display/chromeos/ozone/native_display_delegate_ozone.h"
#include "ui/display/chromeos/ozone/touchscreen_delegate_ozone.h"
+#include "ui/ozone/ozone_platform.h"
#elif defined(USE_X11)
#include "ui/display/chromeos/x11/native_display_delegate_x11.h"
#include "ui/display/chromeos/x11/touchscreen_delegate_x11.h"
@@ -201,7 +201,8 @@ void DisplayConfigurator::Init(bool is_panel_fitting_enabled) {
if (!native_display_delegate_) {
#if defined(USE_OZONE)
- native_display_delegate_.reset(new NativeDisplayDelegateOzone());
+ native_display_delegate_.reset(
+ OzonePlatform::GetInstance()->CreateNativeDisplayDelegate());
#elif defined(USE_X11)
native_display_delegate_.reset(new NativeDisplayDelegateX11());
#else

Powered by Google App Engine
This is Rietveld 408576698