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

Unified Diff: ash/wm/boot_splash_screen_chromeos.cc

Issue 232313002: ozone: Protect X11-specific code under ash/wm (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
« no previous file with comments | « no previous file | ash/wm/system_gesture_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/boot_splash_screen_chromeos.cc
diff --git a/ash/wm/boot_splash_screen_chromeos.cc b/ash/wm/boot_splash_screen_chromeos.cc
index df5765499ef9910f53638d6486d35c6c6275767e..e69d8990b9405825a819b46bc808e43ec1ff8fb8 100644
--- a/ash/wm/boot_splash_screen_chromeos.cc
+++ b/ash/wm/boot_splash_screen_chromeos.cc
@@ -35,8 +35,13 @@ class BootSplashScreen::CopyHostContentLayerDelegate
// TODO(derat): Instead of copying the data, use GLX_EXT_texture_from_pixmap
// to create a zero-copy texture (when possible):
// https://codereview.chromium.org/10543125
+#if !defined(USE_OZONE)
varkha 2014/04/09 23:46:52 Should this maybe use #if defined(USE_X11) just as
spang 2014/04/10 00:12:03 Yeah, that is probably better.
ui::CopyAreaToCanvas(host_->GetAcceleratedWidget(),
host_->GetBounds(), gfx::Point(), canvas);
+#else
+ // TODO(spang): Figure out what to do here.
+ NOTIMPLEMENTED();
+#endif
}
virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {}
« no previous file with comments | « no previous file | ash/wm/system_gesture_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698