chrome/browser/policy/configuration_policy_handler_list_factory.cc - Issue 499253002: Revert of Merge apps/pref* to extensions/browser/pref*

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/policy/configuration_policy_handler_list_factory.cc

Issue 499253002: Revert of Merge apps/pref* to extensions/browser/pref* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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/policy/configuration_policy_handler_list_factory.cc

diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc

index ee95e77d8a9d058eb2f0cfc0268fad8cf497b759..2321a7ad3a426918f088d37071390201ec3c900c 100644

--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc

+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -48,6 +48,10 @@

#include "chrome/browser/download/download_dir_policy_handler.h"

#endif

+#if !defined(OS_MACOSX) && !defined(OS_IOS)

+#include "apps/pref_names.h"

+#endif

#if defined(ENABLE_EXTENSIONS)

#include "chrome/browser/extensions/api/messaging/native_messaging_policy_handler.h"

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

@@ -369,7 +373,7 @@

base::Value::TYPE_BOOLEAN },

#if defined(ENABLE_EXTENSIONS)

{ key::kFullscreenAllowed,

- extensions::pref_names::kAppFullscreenAllowed,

+ apps::prefs::kAppFullscreenAllowed,

base::Value::TYPE_BOOLEAN },

#endif // defined(ENABLE_EXTENSIONS)

#endif // !defined(OS_MACOSX) && !defined(OS_IOS)