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

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

Issue 2666093002: Remove base::FundamentalValue (Closed)
Patch Set: Rebase Created 3 years, 9 months 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 <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 const Extension* extension) { 155 const Extension* extension) {
156 const SettingsOverrides* settings = SettingsOverrides::Get(extension); 156 const SettingsOverrides* settings = SettingsOverrides::Get(extension);
157 if (settings) { 157 if (settings) {
158 std::string install_parameter = 158 std::string install_parameter =
159 ExtensionPrefs::Get(profile_)->GetInstallParam(extension->id()); 159 ExtensionPrefs::Get(profile_)->GetInstallParam(extension->id());
160 if (settings->homepage) { 160 if (settings->homepage) {
161 SetPref(extension->id(), prefs::kHomePage, 161 SetPref(extension->id(), prefs::kHomePage,
162 base::MakeUnique<base::StringValue>(SubstituteInstallParam( 162 base::MakeUnique<base::StringValue>(SubstituteInstallParam(
163 settings->homepage->spec(), install_parameter))); 163 settings->homepage->spec(), install_parameter)));
164 SetPref(extension->id(), prefs::kHomePageIsNewTabPage, 164 SetPref(extension->id(), prefs::kHomePageIsNewTabPage,
165 base::MakeUnique<base::FundamentalValue>(false)); 165 base::MakeUnique<base::Value>(false));
166 } 166 }
167 if (!settings->startup_pages.empty()) { 167 if (!settings->startup_pages.empty()) {
168 SetPref(extension->id(), prefs::kRestoreOnStartup, 168 SetPref(
169 base::MakeUnique<base::FundamentalValue>( 169 extension->id(), prefs::kRestoreOnStartup,
170 SessionStartupPref::kPrefValueURLs)); 170 base::MakeUnique<base::Value>(SessionStartupPref::kPrefValueURLs));
171 if (settings->startup_pages.size() > 1) { 171 if (settings->startup_pages.size() > 1) {
172 VLOG(1) << extensions::ErrorUtils::FormatErrorMessage( 172 VLOG(1) << extensions::ErrorUtils::FormatErrorMessage(
173 kManyStartupPagesWarning, 173 kManyStartupPagesWarning,
174 manifest_keys::kSettingsOverride); 174 manifest_keys::kSettingsOverride);
175 } 175 }
176 std::unique_ptr<base::ListValue> url_list(new base::ListValue); 176 std::unique_ptr<base::ListValue> url_list(new base::ListValue);
177 url_list->AppendString(SubstituteInstallParam( 177 url_list->AppendString(SubstituteInstallParam(
178 settings->startup_pages[0].spec(), install_parameter)); 178 settings->startup_pages[0].spec(), install_parameter));
179 SetPref(extension->id(), prefs::kURLsToRestoreOnStartup, 179 SetPref(extension->id(), prefs::kURLsToRestoreOnStartup,
180 std::move(url_list)); 180 std::move(url_list));
181 } 181 }
182 if (settings->search_engine) { 182 if (settings->search_engine) {
183 // Bring the preference to the correct state. Before this code set it 183 // Bring the preference to the correct state. Before this code set it
184 // to "true" for all search engines. Thus, we should overwrite it for 184 // to "true" for all search engines. Thus, we should overwrite it for
185 // all search engines. 185 // all search engines.
186 if (settings->search_engine->is_default) { 186 if (settings->search_engine->is_default) {
187 SetPref(extension->id(), prefs::kDefaultSearchProviderEnabled, 187 SetPref(extension->id(), prefs::kDefaultSearchProviderEnabled,
188 base::MakeUnique<base::FundamentalValue>(true)); 188 base::MakeUnique<base::Value>(true));
189 } else { 189 } else {
190 UnsetPref(extension->id(), prefs::kDefaultSearchProviderEnabled); 190 UnsetPref(extension->id(), prefs::kDefaultSearchProviderEnabled);
191 } 191 }
192 DCHECK(url_service_); 192 DCHECK(url_service_);
193 RegisterSearchProvider(extension); 193 RegisterSearchProvider(extension);
194 } 194 }
195 } 195 }
196 } 196 }
197 void SettingsOverridesAPI::OnExtensionUnloaded( 197 void SettingsOverridesAPI::OnExtensionUnloaded(
198 content::BrowserContext* browser_context, 198 content::BrowserContext* browser_context,
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 252
253 template <> 253 template <>
254 void BrowserContextKeyedAPIFactory< 254 void BrowserContextKeyedAPIFactory<
255 SettingsOverridesAPI>::DeclareFactoryDependencies() { 255 SettingsOverridesAPI>::DeclareFactoryDependencies() {
256 DependsOn(ExtensionPrefsFactory::GetInstance()); 256 DependsOn(ExtensionPrefsFactory::GetInstance());
257 DependsOn(PreferenceAPI::GetFactoryInstance()); 257 DependsOn(PreferenceAPI::GetFactoryInstance());
258 DependsOn(TemplateURLServiceFactory::GetInstance()); 258 DependsOn(TemplateURLServiceFactory::GetInstance());
259 } 259 }
260 260
261 } // namespace extensions 261 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698