On first run process the master prefs json, only one entry matters to us.

- skip or not first run dialgos
- on skip import silently search provider only

BUG=1394863

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

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

1 files changed, 7 insertions, 4 deletions

diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index dc75760..81f576a 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -39,17 +39,20 @@ class FirstRun {
   // browser process that just does the import with the import progress UI.
   static bool ImportSettings(Profile* profile, int browser,
                              int items_to_import, HWND parent_window);
-  // Import browser items with a progress UI. The browser and the items to
+  // 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().
-  static int ImportWithUI(Profile* profile, const CommandLine& cmdline);
+  // 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);
 
   // These are the possible results of calling ProcessMasterPreferences.
+  // Some of the results can be combined, so they are bit flags.
   enum MasterPrefResult {
     MASTER_PROFILE_NOT_FOUND          = 0,
     MASTER_PROFILE_ERROR              = 1,
     MASTER_PROFILE_SHOW_EULA          = 2,
-    MASTER_PROFILE_NO_FIRST_RUN_UI    = 4
+    MASTER_PROFILE_NO_FIRST_RUN_UI    = 4,
+    MASTER_PROFILE_DO_FIRST_RUN_UI    = 8
   };
 
   // The master preferences is a JSON file with the same entries as the