| 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 "chrome/common/chrome_switches.h" | 5 #include "chrome/common/chrome_switches.h" |
| 6 | 6 |
| 7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 | 9 |
| 10 namespace switches { | 10 namespace switches { |
| (...skipping 1133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1144 const char kWinHttpProxyResolver[] = "winhttp-proxy-resolver"; | 1144 const char kWinHttpProxyResolver[] = "winhttp-proxy-resolver"; |
| 1145 | 1145 |
| 1146 // Specifies which category option was clicked in the Windows Jumplist that | 1146 // Specifies which category option was clicked in the Windows Jumplist that |
| 1147 // resulted in a browser startup. | 1147 // resulted in a browser startup. |
| 1148 const char kWinJumplistAction[] = "win-jumplist-action"; | 1148 const char kWinJumplistAction[] = "win-jumplist-action"; |
| 1149 | 1149 |
| 1150 #if defined(OS_ANDROID) | 1150 #if defined(OS_ANDROID) |
| 1151 // Android authentication account type for SPNEGO authentication | 1151 // Android authentication account type for SPNEGO authentication |
| 1152 const char kAuthAndroidNegotiateAccountType[] = "auth-spnego-account-type"; | 1152 const char kAuthAndroidNegotiateAccountType[] = "auth-spnego-account-type"; |
| 1153 | 1153 |
| 1154 // Marks a renderer as a process that hosts the Contextual Search JS API. |
| 1155 const char kContextualSearchProcess[] = "contextual-search-process"; |
| 1156 |
| 1154 // Disables Contextual Search. | 1157 // Disables Contextual Search. |
| 1155 const char kDisableContextualSearch[] = "disable-contextual-search"; | 1158 const char kDisableContextualSearch[] = "disable-contextual-search"; |
| 1156 | 1159 |
| 1157 // Enable the accessibility tab switcher. | 1160 // Enable the accessibility tab switcher. |
| 1158 const char kEnableAccessibilityTabSwitcher[] = | 1161 const char kEnableAccessibilityTabSwitcher[] = |
| 1159 "enable-accessibility-tab-switcher"; | 1162 "enable-accessibility-tab-switcher"; |
| 1160 | 1163 |
| 1161 // Enables Contextual Search. | 1164 // Enables Contextual Search. |
| 1162 const char kEnableContextualSearch[] = "enable-contextual-search"; | 1165 const char kEnableContextualSearch[] = "enable-contextual-search"; |
| 1163 | 1166 |
| (...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1391 | 1394 |
| 1392 // ----------------------------------------------------------------------------- | 1395 // ----------------------------------------------------------------------------- |
| 1393 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. | 1396 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. |
| 1394 // | 1397 // |
| 1395 // You were going to just dump your switches here, weren't you? Instead, please | 1398 // You were going to just dump your switches here, weren't you? Instead, please |
| 1396 // put them in alphabetical order above, or in order inside the appropriate | 1399 // put them in alphabetical order above, or in order inside the appropriate |
| 1397 // ifdef at the bottom. The order should match the header. | 1400 // ifdef at the bottom. The order should match the header. |
| 1398 // ----------------------------------------------------------------------------- | 1401 // ----------------------------------------------------------------------------- |
| 1399 | 1402 |
| 1400 } // namespace switches | 1403 } // namespace switches |
| OLD | NEW |