chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc - Issue 140343002: extensions: Relocate pref name constants.

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/chromeos/extensions/device_local_account_external_policy_loader.cc

Issue 140343002: extensions: Relocate pref name constants. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add missing include for mac Created 6 years, 11 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/apps/app_browsertest.cc ('k') | chrome/browser/extensions/api/management/management_browsertest.cc » ('j') | extensions/browser/pref_names.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc

diff --git a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc

index 7430e548b25f9a165ed79a0f640f83ad6a35c726..f1e4c97aabfd7f6ccec948c445810a42eb69b5d1 100644

--- a/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc

+++ b/chrome/browser/chromeos/extensions/device_local_account_external_policy_loader.cc

@@ -12,6 +12,7 @@

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

#include "chrome/common/pref_names.h"

#include "components/policy/core/common/policy_map.h"

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

#include "net/url_request/url_request_context_getter.h"

namespace chromeos {

@@ -94,7 +95,8 @@ void DeviceLocalAccountExternalPolicyLoader::UpdateExtensionListFromStore() {

policy_handler.ApplyPolicySettings(policy_map, &pref_value_map);

const base::Value* value = NULL;

const base::DictionaryValue* dict = NULL;

- if (pref_value_map.GetValue(prefs::kExtensionInstallForceList, &value) &&

+ if (pref_value_map.GetValue(extensions::pref_names::kInstallForceList,

+ &value) &&

value->GetAsDictionary(&dict)) {

prefs.reset(dict->DeepCopy());

}