diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 23:11:46 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 23:11:46 +0000 |
| commit | e67ced4317b42834974c31672bdc1b154f569b28 (patch) | |
| tree | 5afc10ed18d8fca30071fc1e34855216c3e6d1f0 /chrome/browser/browser_main.cc | |
| parent | 61c9f03381e1fe7bdad521013fa43e4652a81fcc (diff) | |
| download | chromium_src-e67ced4317b42834974c31672bdc1b154f569b28.zip chromium_src-e67ced4317b42834974c31672bdc1b154f569b28.tar.gz chromium_src-e67ced4317b42834974c31672bdc1b154f569b28.tar.bz2 | |
Port the option to import bookmarks from a file to Linux
- Call ImportNow from browser_main.cc
- Move necessary functions and a class from first_run_win.cc to
first_run.cc and update first_run.h accordingly.
- Add some #defines for different OSes and some TODO(port) comments.
These changes will allow the use of the --import-from-file option to
import bookmarks from a file at first run.
I have built and tested this on Linux and Windows.
BUG=32728
TEST=run with --import-from-file
Patch from Brian G. Merrell <bgmerrell@gmail.com>
Review URL: http://codereview.chromium.org/1515004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43277 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 3913c1d..1fe0e88 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -905,12 +905,14 @@ int BrowserMain(const MainFunctionParams& parameters) { OptionallyRunChromeOSLoginManager(parsed_command_line); } +#if !defined(OS_MACOSX) // Importing other browser settings is done in a browser-like process // that exits when this task has finished. -#if defined(OS_WIN) + // TODO(port): Port to Mac if (parsed_command_line.HasSwitch(switches::kImport) || - parsed_command_line.HasSwitch(switches::kImportFromFile)) + parsed_command_line.HasSwitch(switches::kImportFromFile)) { return FirstRun::ImportNow(profile, parsed_command_line); + } #endif // When another process is running, use it instead of starting us. |