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

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: 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
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e11498d2cebffb38b1b0323e90661f3539a23091 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,10 @@ void SetContentCommandLineFlags(int max_render_process_count) {
parsed_command_line->AppendSwitch(switches::kEnableFixedLayout);
parsed_command_line->AppendSwitch(switches::kEnableViewport);
+#if defined(GOOGLE_TV)
+ parsed_command_line->AppendSwitch(switches::kEnableEncryptedMedia);
jam 2013/01/28 17:47:23 can you do this somewhere under src/chrome? it's n
kjyoun 2013/01/28 19:14:40 Agreed, since this flag is googletv-specific. Then
kjyoun 2013/01/28 19:22:46 fixed typo: right location seems to be "src/clank/
kjyoun 2013/01/28 22:04:27 verified that the change on clank side can make sa
+#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') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698