chrome/browser/extensions/api/preference/preference_helpers.cc - Issue 18341016: Add types.private.ChromeDirectSetting and Connect it to preferencesPrivate.googleGeolocationAccessE…

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/preference/preference_helpers.cc

Issue 18341016: Add types.private.ChromeDirectSetting and Connect it to preferencesPrivate.googleGeolocationAccessE… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync to Latest Created 7 years, 5 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/preference/preference_api.cc ('k') | chrome/browser/extensions/extension_function_histogram_value.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/preference/preference_helpers.cc

diff --git a/chrome/browser/extensions/api/preference/preference_helpers.cc b/chrome/browser/extensions/api/preference/preference_helpers.cc

index e4192dd1d4f945b39c55c86f5f3694b3d79482fc..8649f8eb04323ca5e72d0acef5ac2fedb314a2af 100644

--- a/chrome/browser/extensions/api/preference/preference_helpers.cc

+++ b/chrome/browser/extensions/api/preference/preference_helpers.cc

@@ -8,7 +8,6 @@

#include "base/prefs/pref_service.h"

#include "base/values.h"

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

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

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

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

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

@@ -73,10 +72,7 @@ const char* GetLevelOfControl(

return kControlledByThisExtension;

}

- extensions::ComponentLoader* component_loader =

- profile->GetExtensionService()->component_loader();

- if (component_loader->Exists(extension_id) ||

- PreferenceAPI::Get(profile)->CanExtensionControlPref(extension_id,

+ if (PreferenceAPI::Get(profile)->CanExtensionControlPref(extension_id,

browser_pref,

incognito)) {

return kControllableByThisExtension;