From c6d5cdb28856a33676e3bf40e213bddf204df9df Mon Sep 17 00:00:00 2001 From: "kuchhal@chromium.org" Date: Mon, 19 Oct 2009 18:35:18 +0000 Subject: Make importer obey import_search_engine preference even if FRUI is enabled. With this change importer will give preference to the value specified in master preference for import_search_engine instead of ignoring it like before. BUG=23649 TEST=Specified in above bug. Review URL: http://codereview.chromium.org/274081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29426 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/first_run.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'chrome/browser/first_run.h') diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h index ec8d8f4..e728d64 100644 --- a/chrome/browser/first_run.h +++ b/chrome/browser/first_run.h @@ -71,7 +71,9 @@ class FirstRun { const FilePath& master_prefs_path, std::vector* new_tabs, int* ping_delay, - bool* homepage_defined); + bool* homepage_defined, + int* do_import_items, + int* dont_import_items); // Sets the kShouldShowFirstRunBubble local state pref so that the browser // shows the bubble once the main message loop gets going. Returns false if @@ -157,10 +159,16 @@ class FirstRunBrowserProcess : public BrowserProcessImpl { // while the First Run UI is visible. // |homepage_defined| true indicates that homepage is defined in master // preferences and should not be imported from another browser. +// |import_items| specifies the items to import, specified in master +// preferences and will override default behavior of importer. +// |dont_import_items| specifies the items *not* to import, specified in master +// preferences and will override default behavior of importer. // Returns true if the user clicked "Start", false if the user pressed "Cancel" // or closed the dialog. bool OpenFirstRunDialog(Profile* profile, bool homepage_defined, + int import_items, + int dont_import_items, ProcessSingleton* process_singleton); #endif // CHROME_BROWSER_FIRST_RUN_H_ -- cgit v1.1