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 <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 default_provider_data->search_url_post_params = | 61 default_provider_data->search_url_post_params = |
62 prefs->GetString(prefs::kDefaultSearchProviderSearchURLPostParams); | 62 prefs->GetString(prefs::kDefaultSearchProviderSearchURLPostParams); |
63 default_provider_data->suggestions_url_post_params = | 63 default_provider_data->suggestions_url_post_params = |
64 prefs->GetString(prefs::kDefaultSearchProviderSuggestURLPostParams); | 64 prefs->GetString(prefs::kDefaultSearchProviderSuggestURLPostParams); |
65 default_provider_data->instant_url_post_params = | 65 default_provider_data->instant_url_post_params = |
66 prefs->GetString(prefs::kDefaultSearchProviderInstantURLPostParams); | 66 prefs->GetString(prefs::kDefaultSearchProviderInstantURLPostParams); |
67 default_provider_data->image_url_post_params = | 67 default_provider_data->image_url_post_params = |
68 prefs->GetString(prefs::kDefaultSearchProviderImageURLPostParams); | 68 prefs->GetString(prefs::kDefaultSearchProviderImageURLPostParams); |
69 default_provider_data->favicon_url = | 69 default_provider_data->favicon_url = |
70 GURL(prefs->GetString(prefs::kDefaultSearchProviderIconURL)); | 70 GURL(prefs->GetString(prefs::kDefaultSearchProviderIconURL)); |
71 default_provider_data->show_in_default_list = true; | |
72 default_provider_data->search_terms_replacement_key = | 71 default_provider_data->search_terms_replacement_key = |
73 prefs->GetString(prefs::kDefaultSearchProviderSearchTermsReplacementKey); | 72 prefs->GetString(prefs::kDefaultSearchProviderSearchTermsReplacementKey); |
74 default_provider_data->input_encodings = base::SplitString( | 73 default_provider_data->input_encodings = base::SplitString( |
75 prefs->GetString(prefs::kDefaultSearchProviderEncodings), | 74 prefs->GetString(prefs::kDefaultSearchProviderEncodings), |
76 ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); | 75 ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
77 | 76 |
78 default_provider_data->alternate_urls.clear(); | 77 default_provider_data->alternate_urls.clear(); |
79 const base::ListValue* alternate_urls = | 78 const base::ListValue* alternate_urls = |
80 prefs->GetList(prefs::kDefaultSearchProviderAlternateURLs); | 79 prefs->GetList(prefs::kDefaultSearchProviderAlternateURLs); |
81 for (size_t i = 0; i < alternate_urls->GetSize(); ++i) { | 80 for (size_t i = 0; i < alternate_urls->GetSize(); ++i) { |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
161 void ConfigureDefaultSearchPrefMigrationToDictionaryValue( | 160 void ConfigureDefaultSearchPrefMigrationToDictionaryValue( |
162 PrefService* pref_service) { | 161 PrefService* pref_service) { |
163 if (pref_service->GetInitializationStatus() == | 162 if (pref_service->GetInitializationStatus() == |
164 PrefService::INITIALIZATION_STATUS_WAITING) { | 163 PrefService::INITIALIZATION_STATUS_WAITING) { |
165 pref_service->AddPrefInitObserver( | 164 pref_service->AddPrefInitObserver( |
166 base::Bind(&OnPrefsInitialized, base::Unretained(pref_service))); | 165 base::Bind(&OnPrefsInitialized, base::Unretained(pref_service))); |
167 } else { | 166 } else { |
168 MigrateDefaultSearchPref(pref_service); | 167 MigrateDefaultSearchPref(pref_service); |
169 } | 168 } |
170 } | 169 } |
OLD | NEW |