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

Unified Diff: chrome/browser/chromeos/login/chrome_restart_request.cc

Issue 22875014: Merge 217276 "Add media::VideoEncodeAccelerator with WebRTC inte..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/
Patch Set: Created 7 years, 4 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 | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/chrome_restart_request.cc
===================================================================
--- chrome/browser/chromeos/login/chrome_restart_request.cc (revision 217687)
+++ chrome/browser/chromeos/login/chrome_restart_request.cc (working copy)
@@ -135,6 +135,10 @@
::switches::kUserDataDir,
::switches::kV,
::switches::kEnableWebGLDraftExtensions,
+#if defined(ENABLE_WEBRTC)
+ ::switches::kEnableWebRtcHWDecoding,
+ ::switches::kEnableWebRtcHWEncoding,
+#endif
ash::switches::kAshDefaultGuestWallpaperLarge,
ash::switches::kAshDefaultGuestWallpaperSmall,
ash::switches::kAshDefaultWallpaperLarge,
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698