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

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

Issue 214513006: Add Ozone stub implementations for NativeDisplayDelegate and TouchscreenDelegate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 9 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 | « no previous file | ui/display/chromeos/ozone/native_display_delegate_ozone.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/chromeos/output_configurator.cc
diff --git a/ui/display/chromeos/output_configurator.cc b/ui/display/chromeos/output_configurator.cc
index 255e4b961ca91a54f9a587480f08b4eb5ac3f2f0..9523afe5f4cb0bf92398de88dd32d8ddcb8e3b06 100644
--- a/ui/display/chromeos/output_configurator.cc
+++ b/ui/display/chromeos/output_configurator.cc
@@ -12,8 +12,15 @@
#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"
+
+#if defined(USE_OZONE)
+#include "ui/display/chromeos/ozone/native_display_delegate_ozone.h"
+#include "ui/display/chromeos/ozone/touchscreen_delegate_ozone.h"
+#elif defined(USE_X11)
#include "ui/display/chromeos/x11/native_display_delegate_x11.h"
#include "ui/display/chromeos/x11/touchscreen_delegate_x11.h"
+#endif
namespace ui {
@@ -189,12 +196,25 @@ void OutputConfigurator::Init(bool is_panel_fitting_enabled) {
return;
if (!native_display_delegate_) {
+#if defined(USE_OZONE)
+ native_display_delegate_.reset(new NativeDisplayDelegateOzone());
+#elif defined(USE_X11)
native_display_delegate_.reset(new NativeDisplayDelegateX11());
+#else
+ NOTREACHED();
+#endif
native_display_delegate_->AddObserver(this);
}
- if (!touchscreen_delegate_)
+ if (!touchscreen_delegate_) {
+#if defined(USE_OZONE)
+ touchscreen_delegate_.reset(new TouchscreenDelegateOzone());
+#elif defined(USE_X11)
touchscreen_delegate_.reset(new TouchscreenDelegateX11());
+#else
+ NOTREACHED();
+#endif
+ }
}
void OutputConfigurator::ForceInitialConfigure(uint32_t background_color_argb) {
« no previous file with comments | « no previous file | ui/display/chromeos/ozone/native_display_delegate_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698