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

Unified Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 383903003: ifdef various extensions code to be used only when extensions are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build Created 6 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
Index: chrome/browser/prefs/chrome_pref_service_factory.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 6f2f12a93b48cfdfba90d8599704af043202d09c..4a974b42d9ca4dc316592ef359839aeaea2d5e0e 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -43,7 +43,6 @@
#include "components/sync_driver/pref_names.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
-#include "extensions/browser/pref_names.h"
#include "grit/browser_resources.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
@@ -55,6 +54,10 @@
#include "components/policy/core/common/policy_types.h"
#endif
+#if defined(ENABLE_EXTENSIONS)
+#include "extensions/browser/pref_names.h"
+#endif
+
#if defined(ENABLE_MANAGED_USERS)
#include "chrome/browser/supervised_user/supervised_user_pref_store.h"
#endif
@@ -107,11 +110,13 @@ const PrefHashFilter::TrackedPreferenceMetadata kTrackedPrefs[] = {
PrefHashFilter::ENFORCE_ON_LOAD,
PrefHashFilter::TRACKING_STRATEGY_ATOMIC
},
+#if defined(ENABLE_EXTENSIONS)
{
5, extensions::pref_names::kExtensions,
PrefHashFilter::NO_ENFORCEMENT,
PrefHashFilter::TRACKING_STRATEGY_SPLIT
},
+#endif
{
6, prefs::kGoogleServicesLastUsername,
PrefHashFilter::ENFORCE_ON_LOAD,
@@ -144,6 +149,7 @@ const PrefHashFilter::TrackedPreferenceMetadata kTrackedPrefs[] = {
PrefHashFilter::TRACKING_STRATEGY_ATOMIC
},
#endif
+#if defined(ENABLE_EXTENSIONS)
{
// This pref has been deprecated, leave it here for now for it to be
// properly mapped back to Preferences and cleaned up from there.
@@ -151,6 +157,7 @@ const PrefHashFilter::TrackedPreferenceMetadata kTrackedPrefs[] = {
PrefHashFilter::NO_ENFORCEMENT,
PrefHashFilter::TRACKING_STRATEGY_ATOMIC
},
+#endif
{
13, prefs::kProfileResetPromptMemento,
PrefHashFilter::ENFORCE_ON_LOAD,
@@ -292,11 +299,13 @@ GetTrackingConfiguration() {
data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD;
}
+#if defined(ENABLE_EXTENSIONS)
if (enforcement_group >= GROUP_ENFORCE_ALWAYS_WITH_EXTENSIONS_AND_DSE &&
data.name == extensions::pref_names::kExtensions) {
// Specifically enable extension settings enforcement.
data.enforcement_level = PrefHashFilter::ENFORCE_ON_LOAD;
}
+#endif
result.push_back(data);
}
« no previous file with comments | « chrome/browser/policy/configuration_policy_handler_list_factory.cc ('k') | chrome/browser/ui/tab_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698