diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 22:31:27 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 22:31:27 +0000 |
| commit | 02aae3fac31e8ac28c5ee8c4b70e70dcef599dd0 (patch) | |
| tree | 4cf14589dc2c4b4b5e4bdce8fc14bb5ee116df42 /chrome/browser/browser_main.cc | |
| parent | 8341583b5c0488e9521835210f6abdefd9c0fc4e (diff) | |
| download | chromium_src-02aae3fac31e8ac28c5ee8c4b70e70dcef599dd0.zip chromium_src-02aae3fac31e8ac28c5ee8c4b70e70dcef599dd0.tar.gz chromium_src-02aae3fac31e8ac28c5ee8c4b70e70dcef599dd0.tar.bz2 | |
Add the option of importing bookmarks from file to first run.
BUG=32728
TEST=run with --import-from-file
Review URL: http://codereview.chromium.org/1077007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42266 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index c160379..0971b4a 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -495,7 +495,8 @@ int BrowserMain(const MainFunctionParams& parameters) { parsed_command_line.HasSwitch(switches::kFirstRun); scoped_ptr<BrowserProcessImpl> browser_process; - if (parsed_command_line.HasSwitch(switches::kImport)) { + if (parsed_command_line.HasSwitch(switches::kImport) || + parsed_command_line.HasSwitch(switches::kImportFromFile)) { // We use different BrowserProcess when importing so no GoogleURLTracker is // instantiated (as it makes a URLRequest and we don't have an IO thread, // see bug #1292702). @@ -817,7 +818,8 @@ int BrowserMain(const MainFunctionParams& parameters) { // Importing other browser settings is done in a browser-like process // that exits when this task has finished. #if defined(OS_WIN) - if (parsed_command_line.HasSwitch(switches::kImport)) + if (parsed_command_line.HasSwitch(switches::kImport) || + parsed_command_line.HasSwitch(switches::kImportFromFile)) return FirstRun::ImportNow(profile, parsed_command_line); #endif |