| 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 17 matching lines...) Expand all Loading... |
| 28 if (!command_line->HasSwitch(switch_string)) | 28 if (!command_line->HasSwitch(switch_string)) |
| 29 command_line->AppendSwitchASCII(switch_string, value); | 29 command_line->AppendSwitchASCII(switch_string, value); |
| 30 } | 30 } |
| 31 | 31 |
| 32 } // namespace | 32 } // namespace |
| 33 | 33 |
| 34 void SetChromeSpecificCommandLineFlags() { | 34 void SetChromeSpecificCommandLineFlags() { |
| 35 // Turn on autologin. | 35 // Turn on autologin. |
| 36 SetCommandLineSwitch(switches::kEnableAutologin); | 36 SetCommandLineSwitch(switches::kEnableAutologin); |
| 37 | 37 |
| 38 // Turn on query extraction on omnibox searches. |
| 39 SetCommandLineSwitch(switches::kEnableInstantExtendedAPI); |
| 40 |
| 38 // Enable prerender for the omnibox. | 41 // Enable prerender for the omnibox. |
| 39 SetCommandLineSwitchASCII( | 42 SetCommandLineSwitchASCII( |
| 40 switches::kPrerenderMode, switches::kPrerenderModeSwitchValueEnabled); | 43 switches::kPrerenderMode, switches::kPrerenderModeSwitchValueEnabled); |
| 41 SetCommandLineSwitchASCII( | 44 SetCommandLineSwitchASCII( |
| 42 switches::kPrerenderFromOmnibox, | 45 switches::kPrerenderFromOmnibox, |
| 43 switches::kPrerenderFromOmniboxSwitchValueEnabled); | 46 switches::kPrerenderFromOmniboxSwitchValueEnabled); |
| 44 #if !defined(GOOGLE_TV) | 47 #if !defined(GOOGLE_TV) |
| 45 SetCommandLineSwitch(switches::kDisableEncryptedMedia); | 48 SetCommandLineSwitch(switches::kDisableEncryptedMedia); |
| 46 #endif | 49 #endif |
| 47 } | 50 } |
| OLD | NEW |