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 1119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1130 const char kWinHttpProxyResolver[] = "winhttp-proxy-resolver"; | 1130 const char kWinHttpProxyResolver[] = "winhttp-proxy-resolver"; |
1131 | 1131 |
1132 // Specifies which category option was clicked in the Windows Jumplist that | 1132 // Specifies which category option was clicked in the Windows Jumplist that |
1133 // resulted in a browser startup. | 1133 // resulted in a browser startup. |
1134 const char kWinJumplistAction[] = "win-jumplist-action"; | 1134 const char kWinJumplistAction[] = "win-jumplist-action"; |
1135 | 1135 |
1136 #if defined(OS_ANDROID) | 1136 #if defined(OS_ANDROID) |
1137 // Android authentication account type for SPNEGO authentication | 1137 // Android authentication account type for SPNEGO authentication |
1138 const char kAuthAndroidNegotiateAccountType[] = "auth-spnego-account-type"; | 1138 const char kAuthAndroidNegotiateAccountType[] = "auth-spnego-account-type"; |
1139 | 1139 |
| 1140 // Marks a renderer as a process that hosts the Contextual Search JS API. |
| 1141 const char kContextualSearchProcess[] = "contextual-search-process"; |
| 1142 |
1140 // Disables Contextual Search. | 1143 // Disables Contextual Search. |
1141 const char kDisableContextualSearch[] = "disable-contextual-search"; | 1144 const char kDisableContextualSearch[] = "disable-contextual-search"; |
1142 | 1145 |
1143 // Enable the accessibility tab switcher. | 1146 // Enable the accessibility tab switcher. |
1144 const char kEnableAccessibilityTabSwitcher[] = | 1147 const char kEnableAccessibilityTabSwitcher[] = |
1145 "enable-accessibility-tab-switcher"; | 1148 "enable-accessibility-tab-switcher"; |
1146 | 1149 |
1147 // Enables Contextual Search. | 1150 // Enables Contextual Search. |
1148 const char kEnableContextualSearch[] = "enable-contextual-search"; | 1151 const char kEnableContextualSearch[] = "enable-contextual-search"; |
1149 | 1152 |
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1397 | 1400 |
1398 // ----------------------------------------------------------------------------- | 1401 // ----------------------------------------------------------------------------- |
1399 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. | 1402 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. |
1400 // | 1403 // |
1401 // You were going to just dump your switches here, weren't you? Instead, please | 1404 // You were going to just dump your switches here, weren't you? Instead, please |
1402 // put them in alphabetical order above, or in order inside the appropriate | 1405 // put them in alphabetical order above, or in order inside the appropriate |
1403 // ifdef at the bottom. The order should match the header. | 1406 // ifdef at the bottom. The order should match the header. |
1404 // ----------------------------------------------------------------------------- | 1407 // ----------------------------------------------------------------------------- |
1405 | 1408 |
1406 } // namespace switches | 1409 } // namespace switches |
OLD | NEW |