chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc - Issue 174513003: Move ProfileKeyedAPI implementations to take BrowserContext in the constructor (part 3).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

Issue 174513003: Move ProfileKeyedAPI implementations to take BrowserContext in the constructor (part 3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 10 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h ('k') | chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

index c3d8434ad015b7f19e1246026a18139e615c51cc..89e854500dcb134c36f72c3037622c1a922bcb60 100644

--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

@@ -9,6 +9,7 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/api/preference/preference_api.h"

#include "chrome/browser/prefs/session_startup_pref.h"

+#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/search_engines/template_url.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

#include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"

@@ -69,14 +70,16 @@ TemplateURLData ConvertSearchProvider(

}

} // namespace

-SettingsOverridesAPI::SettingsOverridesAPI(Profile* profile)

- : profile_(profile),

- url_service_(TemplateURLServiceFactory::GetForProfile(profile)) {

- DCHECK(profile);

- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,

- content::Source<Profile>(profile));

- registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,

- content::Source<Profile>(profile));

+SettingsOverridesAPI::SettingsOverridesAPI(content::BrowserContext* context)

+ : profile_(Profile::FromBrowserContext(context)),

+ url_service_(TemplateURLServiceFactory::GetForProfile(profile_)) {

+ DCHECK(profile_);

+ registrar_.Add(this,

+ chrome::NOTIFICATION_EXTENSION_LOADED,

+ content::Source<Profile>(profile_));

+ registrar_.Add(this,

+ chrome::NOTIFICATION_EXTENSION_UNLOADED,

+ content::Source<Profile>(profile_));

}

SettingsOverridesAPI::~SettingsOverridesAPI() {