chrome/browser/themes/theme_syncable_service.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/themes/theme_syncable_service.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:

Index: chrome/browser/themes/theme_syncable_service.cc

diff --git a/chrome/browser/themes/theme_syncable_service.cc b/chrome/browser/themes/theme_syncable_service.cc

index 78065b33f8715fa3c95ab9f47ea7ff2866fbba4f..671a01fb569646e9d64732de0ca7937d5d76931c 100644

--- a/chrome/browser/themes/theme_syncable_service.cc

+++ b/chrome/browser/themes/theme_syncable_service.cc

@@ -10,6 +10,7 @@

#include "chrome/browser/themes/theme_service.h"

#include "chrome/common/extensions/manifest_url_handler.h"

#include "chrome/common/extensions/sync_helper.h"

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

#include "extensions/browser/extension_system.h"

#include "extensions/common/extension.h"

#include "sync/protocol/sync.pb.h"

@@ -219,7 +220,7 @@ void ThemeSyncableService::SetCurrentThemeFromThemeSpecifics(

return;

}

int disabled_reasons =

- extensions_service->extension_prefs()->GetDisableReasons(id);

+ extensions::ExtensionPrefs::Get(profile_)->GetDisableReasons(id);

if (!extensions_service->IsExtensionEnabled(id) &&

disabled_reasons != extensions::Extension::DISABLE_USER_ACTION) {

DVLOG(1) << "Theme " << id << " is disabled with reason "