diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 18:35:18 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-19 18:35:18 +0000 |
| commit | c6d5cdb28856a33676e3bf40e213bddf204df9df (patch) | |
| tree | 0430bfcae805c2a4a46efdfbbd3d2c343353e935 /chrome/common/temp_scaffolding_stubs.cc | |
| parent | 77dc77607d70acba487da70dfaa3f52a6e41a7ab (diff) | |
| download | chromium_src-c6d5cdb28856a33676e3bf40e213bddf204df9df.zip chromium_src-c6d5cdb28856a33676e3bf40e213bddf204df9df.tar.gz chromium_src-c6d5cdb28856a33676e3bf40e213bddf204df9df.tar.bz2 | |
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
Diffstat (limited to 'chrome/common/temp_scaffolding_stubs.cc')
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index 8d73a49..5ec06ca 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -87,7 +87,9 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir, const FilePath& master_prefs_path, std::vector<std::wstring>* new_tabs, int* ping_delay, - bool* homepage_defined) { + bool* homepage_defined, + int* do_import_items, + int* dont_import_items) { // http://code.google.com/p/chromium/issues/detail?id=11971 // Pretend we processed them correctly. return true; |