Add the option of importing bookmarks from file to first run.

BUG=32728
TEST=run with --import-from-file

Review URL: http://codereview.chromium.org/1077007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42266 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 11 insertions, 4 deletions

diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index 2bcecb0..910edf56 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -45,10 +45,9 @@ class FirstRun {
   // Creates the quick launch shortcut to chrome for the current user. Returns
   // false if it fails. It will overwrite the shortcut if it exists.
   static bool CreateChromeQuickLaunchShortcut();
-  // Import browser items in this process. The browser and the items to
-  // import are encoded int the command line. This function is paired with
-  // FirstRun::ImportSettings(). This function might or might not show
-  // a visible UI depending on the cmdline parameters.
+  // Import bookmarks and browser items in this process. This function is
+  // paired with FirstRun::ImportSettings(). This function might or might not
+  // show a visible UI depending on the cmdline parameters.
   static int ImportNow(Profile* profile, const CommandLine& cmdline);
 #endif  // OS_WIN
 
@@ -100,6 +99,14 @@ class FirstRun {
   static bool SetShowWelcomePagePref();
 
  private:
+#if defined(OS_WIN)
+  // Import bookmarks from an html file. The path to the file is provided in
+  // the command line.
+  static int ImportFromFile(Profile* profile, const CommandLine& cmdline);
+  // Import browser items in this process. The browser and the items to
+  // import are encoded int the command line.
+  static int ImportFromBrowser(Profile* profile, const CommandLine& cmdline);
+#endif  // OS_WIN
   // This class is for scoping purposes.
   DISALLOW_IMPLICIT_CONSTRUCTORS(FirstRun);
 };