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

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

Issue 15968002: Revert 201837 "OOP import on Windows." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 | « trunk/src/chrome/common/chrome_switches.h ('k') | trunk/src/chrome/common/switch_utils.cc » ('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 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
815 // <profile_dir>/Default/TransportSecurity 815 // <profile_dir>/Default/TransportSecurity
816 const char kHstsHosts[] = "hsts-hosts"; 816 const char kHstsHosts[] = "hsts-hosts";
817 817
818 // Causes net::URLFetchers to ignore requests for SSL client certificates, 818 // Causes net::URLFetchers to ignore requests for SSL client certificates,
819 // causing them to attempt an unauthenticated SSL/TLS session. This is intended 819 // causing them to attempt an unauthenticated SSL/TLS session. This is intended
820 // for use when testing various service URLs (eg: kPromoServerURL, kInstantURL, 820 // for use when testing various service URLs (eg: kPromoServerURL, kInstantURL,
821 // kSbURLPrefix, kSyncServiceURL, etc) 821 // kSbURLPrefix, kSyncServiceURL, etc)
822 const char kIgnoreUrlFetcherCertRequests[] = 822 const char kIgnoreUrlFetcherCertRequests[] =
823 "ignore-urlfetcher-cert-requests"; 823 "ignore-urlfetcher-cert-requests";
824 824
825 // Performs importing from another browser. The value associated with this
826 // setting encodes the target browser and what items to import.
827 const char kImport[] = "import";
828
829 // Performs bookmark importing from an HTML file. The value associated with
830 // this setting encodes the file path. It may be used jointly with kImport.
831 const char kImportFromFile[] = "import-from-file";
832
825 // Causes the browser to launch directly in incognito mode. 833 // Causes the browser to launch directly in incognito mode.
826 const char kIncognito[] = "incognito"; 834 const char kIncognito[] = "incognito";
827 835
828 // Causes Chrome to attempt to get metadata from the webstore for the 836 // Causes Chrome to attempt to get metadata from the webstore for the
829 // app/extension ID given, and then prompt the user to download and install it. 837 // app/extension ID given, and then prompt the user to download and install it.
830 const char kInstallFromWebstore[] = "install-from-webstore"; 838 const char kInstallFromWebstore[] = "install-from-webstore";
831 839
832 // Marks a renderer as an Instant process. 840 // Marks a renderer as an Instant process.
833 const char kInstantProcess[] = "instant-process"; 841 const char kInstantProcess[] = "instant-process";
834 842
(...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after
1588 1596
1589 // ----------------------------------------------------------------------------- 1597 // -----------------------------------------------------------------------------
1590 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1598 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1591 // 1599 //
1592 // You were going to just dump your switches here, weren't you? Instead, please 1600 // You were going to just dump your switches here, weren't you? Instead, please
1593 // put them in alphabetical order above, or in order inside the appropriate 1601 // put them in alphabetical order above, or in order inside the appropriate
1594 // ifdef at the bottom. The order should match the header. 1602 // ifdef at the bottom. The order should match the header.
1595 // ----------------------------------------------------------------------------- 1603 // -----------------------------------------------------------------------------
1596 1604
1597 } // namespace switches 1605 } // namespace switches
OLDNEW
« no previous file with comments | « trunk/src/chrome/common/chrome_switches.h ('k') | trunk/src/chrome/common/switch_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698