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

Unified Diff: chrome/browser/first_run/first_run.h

Issue 12463030: Do not do AutoImport on Windows since the import process is already ran earlier as part of ProcessM… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix posix compile Created 7 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 | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/first_run/first_run.h
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 0867b3ab288b8bb2824004e2677da519bb1fa7ef..16d6021ebfea8bee1c51370e69aee82346ac2456 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -71,6 +71,7 @@ struct MasterPrefs {
bool suppress_first_run_default_browser_prompt;
std::vector<GURL> new_tabs;
std::vector<GURL> bookmarks;
+ std::string import_bookmarks_path;
std::string variations_seed;
};
@@ -154,6 +155,12 @@ bool DidPerformProfileImport(bool* exited_successfully);
// cmdline parameters.
int ImportNow(Profile* profile, const CommandLine& cmdline);
+// Launches an import process to do initial import work before the profile is
+// created and first_run::AutoImport() is called. On Windows this entirely
+// replaces first_run::AutoImport().
+// TODO(gab): Merge all of these tasks into first_run::AutoImport().
+void LaunchInitialImport(MasterPrefs* out_prefs);
+
// Returns the path for the master preferences file.
base::FilePath MasterPrefsPath();
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/first_run/first_run.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698