| 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 b51318e9375d1722e7235a75014e8a3455eb7afd..3f6e9a87ecab28404ad2a41101707828d5f4240f 100644
|
| --- a/chrome/browser/first_run/first_run.h
|
| +++ b/chrome/browser/first_run/first_run.h
|
| @@ -75,12 +75,9 @@ struct MasterPrefs {
|
| // remove items from here which are being stored temporarily only to be later
|
| // dumped into local_state. Also see related TODO in chrome_browser_main.cc.
|
|
|
| - bool homepage_defined;
|
| - int do_import_items;
|
| - int dont_import_items;
|
| - bool make_chrome_default_for_user;
|
| - bool suppress_first_run_default_browser_prompt;
|
| - bool welcome_page_on_os_upgrade_enabled;
|
| + bool make_chrome_default_for_user = false;
|
| + bool suppress_first_run_default_browser_prompt = false;
|
| + bool welcome_page_on_os_upgrade_enabled = true;
|
| std::vector<GURL> new_tabs;
|
| std::vector<GURL> bookmarks;
|
| std::string import_bookmarks_path;
|
| @@ -158,13 +155,10 @@ bool ShouldDoPersonalDataManagerFirstRun();
|
| // Log a metric for the "FirstRun.SearchEngineBubble" histogram.
|
| void LogFirstRunMetric(FirstRunBubbleMetric metric);
|
|
|
| -// Automatically import history and home page (and search engine, if
|
| -// ShouldShowSearchEngineDialog is true). Also imports bookmarks from file if
|
| +// Automatically imports items requested by |profile|'s configuration (sum of
|
| +// policies and master prefs). Also imports bookmarks from file if
|
| // |import_bookmarks_path| is not empty.
|
| void AutoImport(Profile* profile,
|
| - bool homepage_defined,
|
| - int import_items,
|
| - int dont_import_items,
|
| const std::string& import_bookmarks_path);
|
|
|
| // Does remaining first run tasks. This can pop the first run consent dialog on
|
|
|