chrome/browser/extensions/component_loader.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/component_loader.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/webrtc_audio_private/webrtc_audio_private_api.cc ('k') | chrome/browser/extensions/extension_commands_global_registry.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc

index 7929617591bd4771800e6e54c24ea7bb8e045b62..199614604a2e0031e97e3653d6c98e06780664f1 100644

--- a/chrome/browser/extensions/component_loader.cc

+++ b/chrome/browser/extensions/component_loader.cc

@@ -15,7 +15,6 @@

#include "base/prefs/pref_change_registrar.h"

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/extension_service.h"

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

#include "chrome/browser/search/hotword_service_factory.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

@@ -296,8 +295,7 @@ void ComponentLoader::AddHangoutServicesExtension() {

}

void ComponentLoader::AddHotwordHelperExtension() {

- Profile* profile = static_cast<Profile*>(browser_context_);

- if (HotwordServiceFactory::IsHotwordAllowed(profile)) {

+ if (HotwordServiceFactory::IsHotwordAllowed(browser_context_)) {

Add(IDR_HOTWORD_HELPER_MANIFEST,

base::FilePath(FILE_PATH_LITERAL("hotword_helper")));

}