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

Side by Side Diff: chrome/browser/android/chrome_startup_flags.cc

Issue 15383003: Rename switch to disable prefixed Encrypted Media APIs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <jni.h> 5 #include <jni.h>
6 6
7 #include "chrome/browser/android/chrome_startup_flags.h" 7 #include "chrome/browser/android/chrome_startup_flags.h"
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 26 matching lines...) Expand all
37 SetCommandLineSwitch(switches::kEnableAutologin); 37 SetCommandLineSwitch(switches::kEnableAutologin);
38 38
39 // Enable prerender for the omnibox. 39 // Enable prerender for the omnibox.
40 SetCommandLineSwitchASCII( 40 SetCommandLineSwitchASCII(
41 switches::kPrerenderMode, switches::kPrerenderModeSwitchValueEnabled); 41 switches::kPrerenderMode, switches::kPrerenderModeSwitchValueEnabled);
42 SetCommandLineSwitchASCII( 42 SetCommandLineSwitchASCII(
43 switches::kPrerenderFromOmnibox, 43 switches::kPrerenderFromOmnibox,
44 switches::kPrerenderFromOmniboxSwitchValueEnabled); 44 switches::kPrerenderFromOmniboxSwitchValueEnabled);
45 #if defined(GOOGLE_TV) 45 #if defined(GOOGLE_TV)
46 SetCommandLineSwitch(switches::kPpapiInProcess); 46 SetCommandLineSwitch(switches::kPpapiInProcess);
47 #else
48 SetCommandLineSwitch(switches::kDisableEncryptedMedia);
49 #endif 47 #endif
50 } 48 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698