diff options
author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-24 03:35:40 +0000 |
---|---|---|
committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-24 03:35:40 +0000 |
commit | aff981241af45937bc8b28cb2d3df1c08eeb2db1 (patch) | |
tree | 78cb3ecc590792c0804920b100467fcb72c52267 /chrome/common/chrome_switches.cc | |
parent | 028b8ac199c3b9ef7532ae26386246ef53e61a71 (diff) | |
download | chromium_src-aff981241af45937bc8b28cb2d3df1c08eeb2db1.zip chromium_src-aff981241af45937bc8b28cb2d3df1c08eeb2db1.tar.gz chromium_src-aff981241af45937bc8b28cb2d3df1c08eeb2db1.tar.bz2 |
Revert 201837 "OOP import on Windows."
This broke browser_tests on XP Tests (dbg)(4):
http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%28dbg%29%284%29/builds/33240
[1148:3528:0523/123340:2643015:WARNING:extension_apitest.cc(169)] Workaround for 177163, prematurely stopping test
> OOP import on Windows.
>
> Gets rid of the import process on all platforms -- replaced by a utility process which communicates with a ProfileWriter back in the browser process to write to the profile (this uses the ExternalProcessImporterHost machinery written 2+ years ago by mirandac@ for import on Mac and still the state of the art today).
>
> Gets rid of all issues regarding profile contention and races to profile creation between the browser and import processes on first run (example of issues this has previously caused: http://crbug.com/171475, http://crbug.com/174591, http://crbug.com/180459).
>
> Makes bookmarks file import use the same mechanism on all platforms (this means bookmarks file import is now in-process on Linux which still uses ImporterHost (instead of ExternalProcessImporterHost) -- Linux used to use the import process solely for bookmarks file import -- but the work to switch Linux to ExternalProcessImporterHost should be very minimal after this CL and I intend to do it in a follow-up CL to unify the import flow cross-platform once and for all!).
>
> Do not use the out-of-process import for Google Toolbar (this was already the case prior to this CL).
> To make the Google Toolbar importer work out-of-process, we would have to augment the import IPC drastically to support the web auth flow required by this importer (it requires to login to import the google.com/bookmarks favorites).
>
> This, as a side-effect, brings silent bookmarks file import from master_preferences to Mac (long standing issue 48880).
>
> Also fixes issue 231710 (or at least removes the condition causing the bug by making the ImportLockDialog go away on first run on Windows -- as should already have been the case).
>
> Also addresses issue 178083 since the early message loop spinning was caused by ImportSettingsWin which was called too early on Windows (actually resulting in running the full import twice on Windows!) -- via PreCreateThreadsImpl()-->ProcessMasterPreferences()-->SetImportPreferencesAndLaunchImport()-->ImportSettingsWin()... This whole flow is removed in this CL :).
>
> This improves first run speed in a debug build from 4901ms to 1477ms, a 332% improvement!!!! (tested by instrumenting a first run browser test, the delta is between the time the test is constructed and the time the test case is called (which happens after the browser has been initialized and import has occurred)).
>
> This supersedes https://codereview.chromium.org/12463030/ (which won't be committed because this fix is so much better).
>
> BUG=219419, 22142, 56816, 178083, 178051, 48880, 232241, 231710, 223462, 87657, 236225
>
> Review URL: https://chromiumcodereview.appspot.com/12670013
TBR=gab@chromium.org
Review URL: https://codereview.chromium.org/15968002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201968 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_switches.cc')
-rw-r--r-- | chrome/common/chrome_switches.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index fb33e71..cb485b3 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -822,6 +822,14 @@ const char kHstsHosts[] = "hsts-hosts"; const char kIgnoreUrlFetcherCertRequests[] = "ignore-urlfetcher-cert-requests"; +// Performs importing from another browser. The value associated with this +// setting encodes the target browser and what items to import. +const char kImport[] = "import"; + +// Performs bookmark importing from an HTML file. The value associated with +// this setting encodes the file path. It may be used jointly with kImport. +const char kImportFromFile[] = "import-from-file"; + // Causes the browser to launch directly in incognito mode. const char kIncognito[] = "incognito"; |