Merge r58176: Set default browser after import (OS Win)....

chrome/browser/first_run.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_FIRST_RUN_H_
 #define CHROME_BROWSER_FIRST_RUN_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 27 matching lines @@
     MINIMALBUBBLE     // Minimal bubble shown after search engine dialog
   } BubbleType;
   // See ProcessMasterPreferences for more info about this structure.
   struct MasterPrefs {
     int ping_delay;
     bool homepage_defined;
     int do_import_items;
     int dont_import_items;
     bool run_search_engine_experiment;
     bool randomize_search_engine_experiment;
+    bool make_chrome_default;
     std::vector<GURL> new_tabs;
     std::vector<GURL> bookmarks;
   };
 #if defined(OS_WIN)
   // Creates the desktop shortcut to chrome for the current user. Returns
   // false if it fails. It will overwrite the shortcut if it exists.
   static bool CreateChromeDesktopShortcut();
   // 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();
   // Returns true if we are being run in a locale in which search experiments
   // are allowed.
   static bool InSearchExperimentLocale();
 #endif  // OS_WIN
   // Import bookmarks and/or browser items (depending on platform support)
   // 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);
 
   // Automatically import history and home page (and search engine, if
   // nonorganic).
   static void AutoImport(Profile* profile,
       bool homepage_defined,
       int import_items,
       int dont_import_items,
       bool search_engine_experiment,
       bool randomize_search_engine_experiment,
+      bool make_chrome_default,
       ProcessSingleton* process_singleton);
 
   // The master preferences is a JSON file with the same entries as the
   // 'Default\Preferences' file. This function locates this file from a standard
   // location and processes it so it becomes the default preferences in the
   // profile pointed to by |user_data_dir|. After processing the file, the
   // function returns true if and only if showing the first run dialog is
   // needed. The detailed settings in the preference file are reported via
   // |preference_details|.
   //
@@ skipping 204 matching lines @@
 // or closed the dialog.
 bool OpenFirstRunDialog(Profile* profile,
                         bool homepage_defined,
                         int import_items,
                         int dont_import_items,
                         bool search_engine_experiment,
                         bool randomize_search_engine_experiment,
                         ProcessSingleton* process_singleton);
 
 #endif  // CHROME_BROWSER_FIRST_RUN_H_