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

Unified Diff: chrome/browser/profiles/profile_io_data.h

Issue 2468723003: Move session service and supervised users to buildflags. (Closed)
Patch Set: Created 4 years, 1 month 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/profiles/profile_info_cache.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index c427a7a3868a4e2b23d459ba4b7bd8ccab3cfac3..33e601110bfa689928c91619d20e22d1bc33f7ba 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -24,6 +24,7 @@
#include "chrome/browser/io_thread.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/storage_partition_descriptor.h"
+#include "chrome/common/features.h"
#include "components/content_settings/core/common/content_settings_types.h"
#include "components/policy/core/browser/url_blacklist_manager.h"
#include "components/prefs/pref_member.h"
@@ -226,7 +227,7 @@ class ProfileIOData {
return policy_header_helper_.get();
}
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
const SupervisedUserURLFilter* supervised_user_url_filter() const {
return supervised_user_url_filter_.get();
}
@@ -340,7 +341,7 @@ class ProfileIOData {
// and needs to be on the main thread.
std::unique_ptr<net::ProxyConfigService> proxy_config_service;
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
scoped_refptr<const SupervisedUserURLFilter> supervised_user_url_filter;
#endif
@@ -614,7 +615,7 @@ class ProfileIOData {
mutable std::unique_ptr<ChromeHttpUserAgentSettings>
chrome_http_user_agent_settings_;
-#if defined(ENABLE_SUPERVISED_USERS)
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
mutable scoped_refptr<const SupervisedUserURLFilter>
supervised_user_url_filter_;
#endif
« no previous file with comments | « chrome/browser/profiles/profile_info_cache.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698