| Index: chrome/browser/first_run/first_run_win.cc
|
| diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
|
| index d4c91ceb266be504b6578dc591e43bf861b77866..867d02cf80257c50cd0b2a3b7be53277acb1647d 100644
|
| --- a/chrome/browser/first_run/first_run_win.cc
|
| +++ b/chrome/browser/first_run/first_run_win.cc
|
| @@ -35,6 +35,7 @@
|
| #include "chrome/installer/util/google_update_constants.h"
|
| #include "chrome/installer/util/google_update_settings.h"
|
| #include "chrome/installer/util/install_util.h"
|
| +#include "chrome/installer/util/master_preferences.h"
|
| #include "chrome/installer/util/shell_util.h"
|
| #include "chrome/installer/util/util_constants.h"
|
| #include "content/browser/user_metrics.h"
|
| @@ -308,6 +309,15 @@ bool FirstRun::IsOrganicFirstRun() {
|
| }
|
|
|
| // static
|
| +FilePath FirstRun::MasterPrefsPath() {
|
| + // The standard location of the master prefs is next to the chrome binary.
|
| + FilePath master_prefs;
|
| + if (!PathService::Get(base::DIR_EXE, &master_prefs))
|
| + return FilePath();
|
| + return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
|
| +}
|
| +
|
| +// static
|
| bool FirstRun::ImportSettings(Profile* profile,
|
| int importer_type,
|
| int items_to_import,
|
|
|