| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/search_engines/default_search_pref_migration.h" | 5 #include "components/search_engines/default_search_pref_migration.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 prefs->GetString(prefs::kDefaultSearchProviderSuggestURLPostParams); | 60 prefs->GetString(prefs::kDefaultSearchProviderSuggestURLPostParams); |
| 61 default_provider_data->instant_url_post_params = | 61 default_provider_data->instant_url_post_params = |
| 62 prefs->GetString(prefs::kDefaultSearchProviderInstantURLPostParams); | 62 prefs->GetString(prefs::kDefaultSearchProviderInstantURLPostParams); |
| 63 default_provider_data->image_url_post_params = | 63 default_provider_data->image_url_post_params = |
| 64 prefs->GetString(prefs::kDefaultSearchProviderImageURLPostParams); | 64 prefs->GetString(prefs::kDefaultSearchProviderImageURLPostParams); |
| 65 default_provider_data->favicon_url = | 65 default_provider_data->favicon_url = |
| 66 GURL(prefs->GetString(prefs::kDefaultSearchProviderIconURL)); | 66 GURL(prefs->GetString(prefs::kDefaultSearchProviderIconURL)); |
| 67 default_provider_data->show_in_default_list = true; | 67 default_provider_data->show_in_default_list = true; |
| 68 default_provider_data->search_terms_replacement_key = | 68 default_provider_data->search_terms_replacement_key = |
| 69 prefs->GetString(prefs::kDefaultSearchProviderSearchTermsReplacementKey); | 69 prefs->GetString(prefs::kDefaultSearchProviderSearchTermsReplacementKey); |
| 70 base::SplitString(prefs->GetString(prefs::kDefaultSearchProviderEncodings), | 70 default_provider_data->input_encodings = base::SplitString( |
| 71 ';', &default_provider_data->input_encodings); | 71 prefs->GetString(prefs::kDefaultSearchProviderEncodings), |
| 72 ";", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); |
| 72 | 73 |
| 73 default_provider_data->alternate_urls.clear(); | 74 default_provider_data->alternate_urls.clear(); |
| 74 const base::ListValue* alternate_urls = | 75 const base::ListValue* alternate_urls = |
| 75 prefs->GetList(prefs::kDefaultSearchProviderAlternateURLs); | 76 prefs->GetList(prefs::kDefaultSearchProviderAlternateURLs); |
| 76 for (size_t i = 0; i < alternate_urls->GetSize(); ++i) { | 77 for (size_t i = 0; i < alternate_urls->GetSize(); ++i) { |
| 77 std::string alternate_url; | 78 std::string alternate_url; |
| 78 if (alternate_urls->GetString(i, &alternate_url)) | 79 if (alternate_urls->GetString(i, &alternate_url)) |
| 79 default_provider_data->alternate_urls.push_back(alternate_url); | 80 default_provider_data->alternate_urls.push_back(alternate_url); |
| 80 } | 81 } |
| 81 | 82 |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 void ConfigureDefaultSearchPrefMigrationToDictionaryValue( | 157 void ConfigureDefaultSearchPrefMigrationToDictionaryValue( |
| 157 PrefService* pref_service) { | 158 PrefService* pref_service) { |
| 158 if (pref_service->GetInitializationStatus() == | 159 if (pref_service->GetInitializationStatus() == |
| 159 PrefService::INITIALIZATION_STATUS_WAITING) { | 160 PrefService::INITIALIZATION_STATUS_WAITING) { |
| 160 pref_service->AddPrefInitObserver( | 161 pref_service->AddPrefInitObserver( |
| 161 base::Bind(&OnPrefsInitialized, base::Unretained(pref_service))); | 162 base::Bind(&OnPrefsInitialized, base::Unretained(pref_service))); |
| 162 } else { | 163 } else { |
| 163 MigrateDefaultSearchPref(pref_service); | 164 MigrateDefaultSearchPref(pref_service); |
| 164 } | 165 } |
| 165 } | 166 } |
| OLD | NEW |