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

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

Issue 501263002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/extensions/api/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Just in case Created 6 years, 3 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 "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/extensions/api/preference/preference_api.h" 9 #include "chrome/browser/extensions/api/preference/preference_api.h"
10 #include "chrome/browser/prefs/session_startup_pref.h" 10 #include "chrome/browser/prefs/session_startup_pref.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 245
246 void SettingsOverridesAPI::Shutdown() { 246 void SettingsOverridesAPI::Shutdown() {
247 template_url_sub_.reset(); 247 template_url_sub_.reset();
248 } 248 }
249 249
250 void SettingsOverridesAPI::OnTemplateURLsLoaded() { 250 void SettingsOverridesAPI::OnTemplateURLsLoaded() {
251 // Register search providers for pending extensions. 251 // Register search providers for pending extensions.
252 template_url_sub_.reset(); 252 template_url_sub_.reset();
253 for (PendingExtensions::const_iterator i(pending_extensions_.begin()); 253 for (PendingExtensions::const_iterator i(pending_extensions_.begin());
254 i != pending_extensions_.end(); ++i) { 254 i != pending_extensions_.end(); ++i) {
255 RegisterSearchProvider(*i); 255 RegisterSearchProvider(i->get());
256 } 256 }
257 pending_extensions_.clear(); 257 pending_extensions_.clear();
258 } 258 }
259 259
260 void SettingsOverridesAPI::RegisterSearchProvider( 260 void SettingsOverridesAPI::RegisterSearchProvider(
261 const Extension* extension) const { 261 const Extension* extension) const {
262 DCHECK(url_service_); 262 DCHECK(url_service_);
263 DCHECK(extension); 263 DCHECK(extension);
264 const SettingsOverrides* settings = SettingsOverrides::Get(extension); 264 const SettingsOverrides* settings = SettingsOverrides::Get(extension);
265 DCHECK(settings); 265 DCHECK(settings);
(...skipping 13 matching lines...) Expand all
279 279
280 template <> 280 template <>
281 void BrowserContextKeyedAPIFactory< 281 void BrowserContextKeyedAPIFactory<
282 SettingsOverridesAPI>::DeclareFactoryDependencies() { 282 SettingsOverridesAPI>::DeclareFactoryDependencies() {
283 DependsOn(ExtensionPrefsFactory::GetInstance()); 283 DependsOn(ExtensionPrefsFactory::GetInstance());
284 DependsOn(PreferenceAPI::GetFactoryInstance()); 284 DependsOn(PreferenceAPI::GetFactoryInstance());
285 DependsOn(TemplateURLServiceFactory::GetInstance()); 285 DependsOn(TemplateURLServiceFactory::GetInstance());
286 } 286 }
287 287
288 } // namespace extensions 288 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698