Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 14030003: Remove Chrome Frame's delay shutdown field trial. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Dear Greg Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome_frame/chrome_frame_automation.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 // Checks the cloud print connector policy, informing the service process if 145 // Checks the cloud print connector policy, informing the service process if
146 // the policy is set to disallow the connector, then quits. 146 // the policy is set to disallow the connector, then quits.
147 const char kCheckCloudPrintConnectorPolicy[] = 147 const char kCheckCloudPrintConnectorPolicy[] =
148 "check-cloud-print-connector-policy"; 148 "check-cloud-print-connector-policy";
149 149
150 // Run Chrome in Chrome Frame mode. This means that Chrome expects to be run 150 // Run Chrome in Chrome Frame mode. This means that Chrome expects to be run
151 // as a dependent process of the Chrome Frame plugin. 151 // as a dependent process of the Chrome Frame plugin.
152 const char kChromeFrame[] = "chrome-frame"; 152 const char kChromeFrame[] = "chrome-frame";
153 153
154 // Tells Chrome to delay shutdown (for a specified number of seconds) when a
155 // Chrome Frame automation channel is closed.
156 const char kChromeFrameShutdownDelay[] = "chrome-frame-shutdown-delay";
157
158 // Tells chrome to load the specified version of chrome.dll on Windows. If this 154 // Tells chrome to load the specified version of chrome.dll on Windows. If this
159 // version cannot be loaded, Chrome will exit. 155 // version cannot be loaded, Chrome will exit.
160 const char kChromeVersion[] = "chrome-version"; 156 const char kChromeVersion[] = "chrome-version";
161 157
162 // Comma-separated list of SSL cipher suites to disable. 158 // Comma-separated list of SSL cipher suites to disable.
163 const char kCipherSuiteBlacklist[] = "cipher-suite-blacklist"; 159 const char kCipherSuiteBlacklist[] = "cipher-suite-blacklist";
164 160
165 // Clears the token service before using it. This allows simulating the 161 // Clears the token service before using it. This allows simulating the
166 // expiration of credentials during testing. 162 // expiration of credentials during testing.
167 const char kClearTokenService[] = "clear-token-service"; 163 const char kClearTokenService[] = "clear-token-service";
(...skipping 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after
1686 1682
1687 // ----------------------------------------------------------------------------- 1683 // -----------------------------------------------------------------------------
1688 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1684 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1689 // 1685 //
1690 // You were going to just dump your switches here, weren't you? Instead, please 1686 // You were going to just dump your switches here, weren't you? Instead, please
1691 // put them in alphabetical order above, or in order inside the appropriate 1687 // put them in alphabetical order above, or in order inside the appropriate
1692 // ifdef at the bottom. The order should match the header. 1688 // ifdef at the bottom. The order should match the header.
1693 // ----------------------------------------------------------------------------- 1689 // -----------------------------------------------------------------------------
1694 1690
1695 } // namespace switches 1691 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome_frame/chrome_frame_automation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698