Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Side by Side Diff: chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

Issue 2476493003: Remove FundamentalValue
Patch Set: Fix Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/extensions/api/settings_overrides/settings_overrides_ap i.h" 5 #include "chrome/browser/extensions/api/settings_overrides/settings_overrides_ap i.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 if (settings) { 171 if (settings) {
172 std::string install_parameter = 172 std::string install_parameter =
173 ExtensionPrefs::Get(profile_)->GetInstallParam(extension->id()); 173 ExtensionPrefs::Get(profile_)->GetInstallParam(extension->id());
174 if (settings->homepage) { 174 if (settings->homepage) {
175 SetPref(extension->id(), 175 SetPref(extension->id(),
176 prefs::kHomePage, 176 prefs::kHomePage,
177 new base::StringValue(SubstituteInstallParam( 177 new base::StringValue(SubstituteInstallParam(
178 settings->homepage->spec(), install_parameter))); 178 settings->homepage->spec(), install_parameter)));
179 SetPref(extension->id(), 179 SetPref(extension->id(),
180 prefs::kHomePageIsNewTabPage, 180 prefs::kHomePageIsNewTabPage,
181 new base::FundamentalValue(false)); 181 new base::Value(false));
182 } 182 }
183 if (!settings->startup_pages.empty()) { 183 if (!settings->startup_pages.empty()) {
184 SetPref(extension->id(), 184 SetPref(extension->id(),
185 prefs::kRestoreOnStartup, 185 prefs::kRestoreOnStartup,
186 new base::FundamentalValue(SessionStartupPref::kPrefValueURLs)); 186 new base::Value(SessionStartupPref::kPrefValueURLs));
187 if (settings->startup_pages.size() > 1) { 187 if (settings->startup_pages.size() > 1) {
188 VLOG(1) << extensions::ErrorUtils::FormatErrorMessage( 188 VLOG(1) << extensions::ErrorUtils::FormatErrorMessage(
189 kManyStartupPagesWarning, 189 kManyStartupPagesWarning,
190 manifest_keys::kSettingsOverride); 190 manifest_keys::kSettingsOverride);
191 } 191 }
192 std::unique_ptr<base::ListValue> url_list(new base::ListValue); 192 std::unique_ptr<base::ListValue> url_list(new base::ListValue);
193 url_list->AppendString(SubstituteInstallParam( 193 url_list->AppendString(SubstituteInstallParam(
194 settings->startup_pages[0].spec(), install_parameter)); 194 settings->startup_pages[0].spec(), install_parameter));
195 SetPref( 195 SetPref(
196 extension->id(), prefs::kURLsToRestoreOnStartup, url_list.release()); 196 extension->id(), prefs::kURLsToRestoreOnStartup, url_list.release());
197 } 197 }
198 if (settings->search_engine) { 198 if (settings->search_engine) {
199 // Bring the preference to the correct state. Before this code set it 199 // Bring the preference to the correct state. Before this code set it
200 // to "true" for all search engines. Thus, we should overwrite it for 200 // to "true" for all search engines. Thus, we should overwrite it for
201 // all search engines. 201 // all search engines.
202 if (settings->search_engine->is_default) { 202 if (settings->search_engine->is_default) {
203 SetPref(extension->id(), 203 SetPref(extension->id(),
204 prefs::kDefaultSearchProviderEnabled, 204 prefs::kDefaultSearchProviderEnabled,
205 new base::FundamentalValue(true)); 205 new base::Value(true));
206 } else { 206 } else {
207 UnsetPref(extension->id(), prefs::kDefaultSearchProviderEnabled); 207 UnsetPref(extension->id(), prefs::kDefaultSearchProviderEnabled);
208 } 208 }
209 DCHECK(url_service_); 209 DCHECK(url_service_);
210 if (url_service_->loaded()) { 210 if (url_service_->loaded()) {
211 RegisterSearchProvider(extension); 211 RegisterSearchProvider(extension);
212 } else { 212 } else {
213 if (!template_url_sub_) { 213 if (!template_url_sub_) {
214 template_url_sub_ = url_service_->RegisterOnLoadedCallback( 214 template_url_sub_ = url_service_->RegisterOnLoadedCallback(
215 base::Bind(&SettingsOverridesAPI::OnTemplateURLsLoaded, 215 base::Bind(&SettingsOverridesAPI::OnTemplateURLsLoaded,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 285
286 template <> 286 template <>
287 void BrowserContextKeyedAPIFactory< 287 void BrowserContextKeyedAPIFactory<
288 SettingsOverridesAPI>::DeclareFactoryDependencies() { 288 SettingsOverridesAPI>::DeclareFactoryDependencies() {
289 DependsOn(ExtensionPrefsFactory::GetInstance()); 289 DependsOn(ExtensionPrefsFactory::GetInstance());
290 DependsOn(PreferenceAPI::GetFactoryInstance()); 290 DependsOn(PreferenceAPI::GetFactoryInstance());
291 DependsOn(TemplateURLServiceFactory::GetInstance()); 291 DependsOn(TemplateURLServiceFactory::GetInstance());
292 } 292 }
293 293
294 } // namespace extensions 294 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698