Chromium Code Reviews| 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" |
| 11 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
| 12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
| 15 #include "components/autofill/common/autofill_switches.h" | |
|
Nico
2013/05/20 21:29:32
revert this
| |
| 15 #include "content/public/common/content_switches.h" | 16 #include "content/public/common/content_switches.h" |
|
Albert Bodenhamer
2013/05/20 21:26:23
nit: Not needed.
| |
| 16 #include "media/base/media_switches.h" | 17 #include "media/base/media_switches.h" |
| 17 | 18 |
| 18 namespace { | 19 namespace { |
| 19 | 20 |
| 20 void SetCommandLineSwitch(const std::string& switch_string) { | 21 void SetCommandLineSwitch(const std::string& switch_string) { |
| 21 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 22 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
| 22 if (!command_line->HasSwitch(switch_string)) | 23 if (!command_line->HasSwitch(switch_string)) |
| 23 command_line->AppendSwitch(switch_string); | 24 command_line->AppendSwitch(switch_string); |
| 24 } | 25 } |
| 25 | 26 |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 41 switches::kPrerenderMode, switches::kPrerenderModeSwitchValueEnabled); | 42 switches::kPrerenderMode, switches::kPrerenderModeSwitchValueEnabled); |
| 42 SetCommandLineSwitchASCII( | 43 SetCommandLineSwitchASCII( |
| 43 switches::kPrerenderFromOmnibox, | 44 switches::kPrerenderFromOmnibox, |
| 44 switches::kPrerenderFromOmniboxSwitchValueEnabled); | 45 switches::kPrerenderFromOmniboxSwitchValueEnabled); |
| 45 #if defined(GOOGLE_TV) | 46 #if defined(GOOGLE_TV) |
| 46 SetCommandLineSwitch(switches::kPpapiInProcess); | 47 SetCommandLineSwitch(switches::kPpapiInProcess); |
| 47 #else | 48 #else |
| 48 SetCommandLineSwitch(switches::kDisableEncryptedMedia); | 49 SetCommandLineSwitch(switches::kDisableEncryptedMedia); |
| 49 #endif | 50 #endif |
| 50 } | 51 } |
| OLD | NEW |