chrome/browser/ui/app_list/extension_app_model_builder.cc - Issue 156843004: Remove ExtensionService::extension_prefs()

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/ui/app_list/extension_app_model_builder.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix UserScriptListenerTests.MultiProfile 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/ui/app_list/extension_app_item.cc ('k') | chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/app_list/extension_app_model_builder.cc

diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.cc b/chrome/browser/ui/app_list/extension_app_model_builder.cc

index 56de1b93f5a44095bce331407e48d1f6c7992ae8..e05b788d5de9286001383d15778391b2ceb6c2a6 100644

--- a/chrome/browser/ui/app_list/extension_app_model_builder.cc

+++ b/chrome/browser/ui/app_list/extension_app_model_builder.cc

@@ -7,11 +7,11 @@

#include <algorithm>

#include "base/auto_reset.h"

+#include "base/bind.h"

#include "base/callback.h"

#include "base/command_line.h"

#include "base/prefs/pref_service.h"

#include "chrome/browser/chrome_notification_types.h"

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

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

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

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

@@ -25,6 +25,7 @@

#include "content/public/browser/notification_service.h"

#include "extensions/browser/extension_prefs.h"

#include "extensions/browser/extension_system.h"

+#include "extensions/browser/extensions_browser_client.h"

#include "extensions/browser/pref_names.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_set.h"

@@ -90,13 +91,10 @@ void ExtensionAppModelBuilder::InitializePrefChangeRegistrar() {

switches::kEnableStreamlinedHostedApps))

return;

- const ExtensionService* extension_service =

- extensions::ExtensionSystem::Get(profile_)->extension_service();

- if (!extension_service)

- return;

+ extensions::ExtensionsBrowserClient* client =

+ extensions::ExtensionsBrowserClient::Get();

extension_pref_change_registrar_.Init(

- extension_service->extension_prefs()->pref_service());

+ client->GetPrefServiceForContext(profile_));

extension_pref_change_registrar_.Add(

extensions::pref_names::kExtensions,

base::Bind(&ExtensionAppModelBuilder::OnExtensionPreferenceChanged,