diff options
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. |