summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkjyoun@google.com <kjyoun@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-16 00:56:50 +0000
committerkjyoun@google.com <kjyoun@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-16 00:56:50 +0000
commit44d379500f3b520a43cae55105f8b58a9a531ea0 (patch)
tree7b52f96b12fcb1180be021104b09dc0917342f7e
parent2735271ca64e47103858895952f546f9a4c8ce2a (diff)
downloadchromium_src-44d379500f3b520a43cae55105f8b58a9a531ea0.zip
chromium_src-44d379500f3b520a43cae55105f8b58a9a531ea0.tar.gz
chromium_src-44d379500f3b520a43cae55105f8b58a9a531ea0.tar.bz2
Remove EnableEncryptedMedia flag for GoogleTV
Now EME is enabled by default with below change https://chromiumcodereview.appspot.com/12090061 BUG=175045 Review URL: https://chromiumcodereview.appspot.com/12224067 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182879 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/android/chrome_startup_flags.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/android/chrome_startup_flags.cc b/chrome/browser/android/chrome_startup_flags.cc
index 073a59b..aa4e86a 100644
--- a/chrome/browser/android/chrome_startup_flags.cc
+++ b/chrome/browser/android/chrome_startup_flags.cc
@@ -41,7 +41,7 @@ void SetChromeSpecificCommandLineFlags() {
SetCommandLineSwitchASCII(
switches::kPrerenderFromOmnibox,
switches::kPrerenderFromOmniboxSwitchValueEnabled);
-#if defined(GOOGLE_TV)
- SetCommandLineSwitch(switches::kEnableEncryptedMedia);
+#if !defined(GOOGLE_TV)
+ SetCommandLineSwitch(switches::kDisableEncryptedMedia);
#endif
}