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

Unified Diff: content/browser/android/content_startup_flags.cc

Issue 12026010: Add GOOGLE_TV build tag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: filed crbug and updated todo Created 7 years, 11 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: content/browser/android/content_startup_flags.cc
diff --git a/content/browser/android/content_startup_flags.cc b/content/browser/android/content_startup_flags.cc
index 3e0ee61af2a669a87247093f83b65e7f94af0c20..23191a61a5729e4d24ccebac3d905d9528fe73c1 100644
--- a/content/browser/android/content_startup_flags.cc
+++ b/content/browser/android/content_startup_flags.cc
@@ -11,6 +11,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/content_switches.h"
+#include "media/base/media_switches.h"
#include "ui/base/ui_base_switches.h"
namespace content {
@@ -67,6 +68,14 @@ void SetContentCommandLineFlags(int max_render_process_count) {
parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
parsed_command_line->AppendSwitch(switches::kEnableViewport);
+#if defined(GOOGLE_TV)
+ // Cdm plugin should run out of process.
brettw 2013/01/25 22:46:42 Indenting is off.
kjyoun 2013/01/28 17:30:49 Done.
+ // TODO: Remove this switch, when http://crbug.com/171858 is resovled.
+ parsed_command_line->AppendSwitch(switches::kPpapiOutOfProcess);
brettw 2013/01/25 22:46:42 This is not the right way to force a random plugin
kjyoun 2013/01/28 17:30:49 Agreed. will pass this info when we register plugi
+
+ parsed_command_line->AppendSwitch(switches::kEnableEncryptedMedia);
+#endif
+
// FIXME(aelias): Commented out due to flaky tests.
// parsed_command_line->AppendSwitch(
// cc::switches::kEnableCompositorFrameMessage);
« no previous file with comments | « build/common.gypi ('k') | webkit/glue/webpreferences.cc » ('j') | webkit/glue/webpreferences.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698