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

Unified Diff: chrome/browser/ui/views/desktop_media_picker_views.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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: chrome/browser/ui/views/desktop_media_picker_views.cc
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc
index bfc4479c545fe3c63724fc9508d5b69158dbd6ea..183b157d081ed512726788c5d5445c248a2db60c 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -54,8 +54,11 @@ DesktopMediaID::Id AcceleratedWidgetToDesktopMediaId(
gfx::AcceleratedWidget accelerated_widget) {
#if defined(OS_WIN)
return reinterpret_cast<DesktopMediaID::Id>(accelerated_widget);
-#else
+#elif !defined(OS_ANDROID)
return static_cast<DesktopMediaID::Id>(accelerated_widget);
+#else
+ assert(false);
+ return static_cast<DesktopMediaID::Id>(0);
#endif
}

Powered by Google App Engine
This is Rietveld 408576698