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

Unified Diff: chrome/browser/first_run/first_run_linux.cc

Issue 12670013: Out-of-process import on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on top of https://codereview.chromium.org/15736014/ Created 7 years, 7 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 | « chrome/browser/first_run/first_run_internal.h ('k') | chrome/browser/first_run/first_run_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/first_run_linux.cc
diff --git a/chrome/browser/first_run/first_run_linux.cc b/chrome/browser/first_run/first_run_linux.cc
index cfef7277f14ba4b12d3ed3ff9805e3bc078325d8..2bd99e9c352d3df0b77a3ad10a95f781e0af8f1a 100644
--- a/chrome/browser/first_run/first_run_linux.cc
+++ b/chrome/browser/first_run/first_run_linux.cc
@@ -31,37 +31,6 @@ bool IsOrganicFirstRun() {
return true;
}
-// TODO(port): This is just a piece of the silent import functionality from
-// ImportSettings for Windows. It would be nice to get the rest of it ported.
-bool ImportBookmarks(const base::FilePath& import_bookmarks_path) {
- const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
- CommandLine import_cmd(cmdline.GetProgram());
-
- // Propagate user data directory switch.
- if (cmdline.HasSwitch(switches::kUserDataDir)) {
- import_cmd.AppendSwitchPath(switches::kUserDataDir,
- cmdline.GetSwitchValuePath(switches::kUserDataDir));
- }
- // Since ImportSettings is called before the local state is stored on disk
- // we pass the language as an argument. GetApplicationLocale checks the
- // current command line as fallback.
- import_cmd.AppendSwitchASCII(switches::kLang,
- g_browser_process->GetApplicationLocale());
-
- import_cmd.CommandLine::AppendSwitchPath(switches::kImportFromFile,
- import_bookmarks_path);
-
- // The importer doesn't need to do any background networking tasks so disable
- // them.
- import_cmd.CommandLine::AppendSwitch(switches::kDisableBackgroundNetworking);
-
- // Time to launch the process that is going to do the import. We'll wait
- // for the process to return.
- base::LaunchOptions options;
- options.wait = true;
- return base::LaunchProcess(import_cmd, options, NULL);
-}
-
base::FilePath MasterPrefsPath() {
// The standard location of the master prefs is next to the chrome binary.
base::FilePath master_prefs;
« no previous file with comments | « chrome/browser/first_run/first_run_internal.h ('k') | chrome/browser/first_run/first_run_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698