| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/first_run/first_run.h" | 5 #include "chrome/browser/first_run/first_run.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 // Since ImportSettings is called before the local state is stored on disk | 34 // Since ImportSettings is called before the local state is stored on disk |
| 35 // we pass the language as an argument. GetApplicationLocale checks the | 35 // we pass the language as an argument. GetApplicationLocale checks the |
| 36 // current command line as fallback. | 36 // current command line as fallback. |
| 37 import_cmd.AppendSwitchASCII(switches::kLang, | 37 import_cmd.AppendSwitchASCII(switches::kLang, |
| 38 g_browser_process->GetApplicationLocale()); | 38 g_browser_process->GetApplicationLocale()); |
| 39 | 39 |
| 40 import_cmd.CommandLine::AppendSwitchPath(switches::kImportFromFile, | 40 import_cmd.CommandLine::AppendSwitchPath(switches::kImportFromFile, |
| 41 import_bookmarks_path); | 41 import_bookmarks_path); |
| 42 // Time to launch the process that is going to do the import. We'll wait | 42 // Time to launch the process that is going to do the import. We'll wait |
| 43 // for the process to return. | 43 // for the process to return. |
| 44 return base::LaunchApp(import_cmd, true, false, NULL); | 44 base::LaunchOptions options; |
| 45 options.wait = true; |
| 46 return base::LaunchProcess(import_cmd, options); |
| 45 } | 47 } |
| 46 | 48 |
| 47 // static | 49 // static |
| 48 bool FirstRun::IsOrganicFirstRun() { | 50 bool FirstRun::IsOrganicFirstRun() { |
| 49 // We treat all installs as organic. | 51 // We treat all installs as organic. |
| 50 return true; | 52 return true; |
| 51 } | 53 } |
| 52 | 54 |
| 53 // static | 55 // static |
| 54 void FirstRun::PlatformSetup() { | 56 void FirstRun::PlatformSetup() { |
| 55 // Things that Windows does here (creating a desktop icon, for example) are | 57 // Things that Windows does here (creating a desktop icon, for example) are |
| 56 // handled at install time on Linux. | 58 // handled at install time on Linux. |
| 57 } | 59 } |
| OLD | NEW |