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

Unified Diff: chrome/browser/browser_main.cc

Issue 1077007: Add the option of importing bookmarks from file to first run.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/first_run.h » ('j') | chrome/browser/first_run_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 42130)
+++ chrome/browser/browser_main.cc (working copy)
@@ -466,7 +466,8 @@
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).
@@ -785,7 +786,8 @@
// 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
« no previous file with comments | « no previous file | chrome/browser/first_run.h » ('j') | chrome/browser/first_run_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698