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

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: add missing header 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..b4458993c43bffac6d2db48a0b5c6a2be913a9a2 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(ANDROID_TV)
+ // Cdm plugin should run out of proces
Yaron 2013/01/23 00:45:28 What's the "Cdm plugin"? Can you add a TODO and fi
kjyoun 2013/01/23 21:02:57 Cdm plugin is a pepper plugin to support Encrypted
Yaron 2013/01/24 00:32:29 Please add a TODO and file a crbug as requested (p
kjyoun 2013/01/24 00:55:46 Done.
+ // Will remove this part, when "out-of-process" becomes default.
+ parsed_command_line->AppendSwitch(switches::kPpapiOutOfProcess);
+
+ parsed_command_line->AppendSwitch(switches::kEnableEncryptedMedia);
+#endif
+
// FIXME(aelias): Commented out due to flaky tests.
// parsed_command_line->AppendSwitch(
// cc::switches::kEnableCompositorFrameMessage);
« build/common.gypi ('K') | « build/common.gypi ('k') | webkit/glue/webpreferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698