| OLD | NEW |
| 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 Loading... |
| 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 } |
| OLD | NEW |