Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1794)

Unified Diff: chrome/browser/policy/configuration_policy_handler_list_factory.cc

Issue 493003002: Merge apps/pref* to extensions/browser/pref* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix GN 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/apps/app_launch_for_metro_restart_win.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cd582cb80bce84c045412e0a68f493ee3e39d0fd..d39735a0a4f8826d0240e222e990dfe861e5c005 100644
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -48,10 +48,6 @@
#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"
@@ -370,7 +366,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
base::Value::TYPE_BOOLEAN },
#if defined(ENABLE_EXTENSIONS)
{ key::kFullscreenAllowed,
- apps::prefs::kAppFullscreenAllowed,
+ extensions::pref_names::kAppFullscreenAllowed,
base::Value::TYPE_BOOLEAN },
#endif // defined(ENABLE_EXTENSIONS)
#endif // !defined(OS_MACOSX) && !defined(OS_IOS)
« no previous file with comments | « chrome/browser/apps/app_launch_for_metro_restart_win.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698