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

Side by Side Diff: chrome/browser/profiles/off_the_record_profile_impl.cc

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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profiles/off_the_record_profile_impl.h" 5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 24 matching lines...) Expand all
35 #include "chrome/browser/prefs/pref_service_syncable_util.h" 35 #include "chrome/browser/prefs/pref_service_syncable_util.h"
36 #include "chrome/browser/profiles/profile_manager.h" 36 #include "chrome/browser/profiles/profile_manager.h"
37 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" 37 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
38 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h" 38 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
39 #include "chrome/browser/themes/theme_service.h" 39 #include "chrome/browser/themes/theme_service.h"
40 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 40 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
41 #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h" 41 #include "chrome/browser/ui/zoom/chrome_zoom_level_otr_delegate.h"
42 #include "chrome/common/chrome_constants.h" 42 #include "chrome/common/chrome_constants.h"
43 #include "chrome/common/chrome_paths.h" 43 #include "chrome/common/chrome_paths.h"
44 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
45 #include "chrome/common/features.h"
45 #include "components/content_settings/core/browser/host_content_settings_map.h" 46 #include "components/content_settings/core/browser/host_content_settings_map.h"
46 #include "components/keyed_service/content/browser_context_dependency_manager.h" 47 #include "components/keyed_service/content/browser_context_dependency_manager.h"
47 #include "components/prefs/json_pref_store.h" 48 #include "components/prefs/json_pref_store.h"
48 #include "components/proxy_config/pref_proxy_config_tracker.h" 49 #include "components/proxy_config/pref_proxy_config_tracker.h"
49 #include "components/sync_preferences/pref_service_syncable.h" 50 #include "components/sync_preferences/pref_service_syncable.h"
50 #include "components/user_prefs/user_prefs.h" 51 #include "components/user_prefs/user_prefs.h"
51 #include "components/zoom/zoom_event_manager.h" 52 #include "components/zoom/zoom_event_manager.h"
52 #include "content/public/browser/browser_thread.h" 53 #include "content/public/browser/browser_thread.h"
53 #include "content/public/browser/host_zoom_map.h" 54 #include "content/public/browser/host_zoom_map.h"
54 #include "content/public/browser/render_process_host.h" 55 #include "content/public/browser/render_process_host.h"
(...skipping 20 matching lines...) Expand all
75 76
76 #if defined(ENABLE_EXTENSIONS) 77 #if defined(ENABLE_EXTENSIONS)
77 #include "chrome/browser/extensions/extension_service.h" 78 #include "chrome/browser/extensions/extension_service.h"
78 #include "chrome/browser/extensions/extension_special_storage_policy.h" 79 #include "chrome/browser/extensions/extension_special_storage_policy.h"
79 #include "components/guest_view/browser/guest_view_manager.h" 80 #include "components/guest_view/browser/guest_view_manager.h"
80 #include "extensions/browser/api/web_request/web_request_api.h" 81 #include "extensions/browser/api/web_request/web_request_api.h"
81 #include "extensions/browser/extension_system.h" 82 #include "extensions/browser/extension_system.h"
82 #include "extensions/common/extension.h" 83 #include "extensions/common/extension.h"
83 #endif 84 #endif
84 85
85 #if defined(ENABLE_SUPERVISED_USERS) 86 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
86 #include "chrome/browser/content_settings/content_settings_supervised_provider.h " 87 #include "chrome/browser/content_settings/content_settings_supervised_provider.h "
87 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" 88 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
88 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h" 89 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
89 #endif 90 #endif
90 91
91 using content::BrowserThread; 92 using content::BrowserThread;
92 using content::DownloadManagerDelegate; 93 using content::DownloadManagerDelegate;
93 using content::HostZoomMap; 94 using content::HostZoomMap;
94 95
95 #if defined(ENABLE_EXTENSIONS) 96 #if defined(ENABLE_EXTENSIONS)
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() { 552 PrefProxyConfigTracker* OffTheRecordProfileImpl::CreateProxyConfigTracker() {
552 #if defined(OS_CHROMEOS) 553 #if defined(OS_CHROMEOS)
553 if (chromeos::ProfileHelper::IsSigninProfile(this)) { 554 if (chromeos::ProfileHelper::IsSigninProfile(this)) {
554 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( 555 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
555 g_browser_process->local_state()); 556 g_browser_process->local_state());
556 } 557 }
557 #endif // defined(OS_CHROMEOS) 558 #endif // defined(OS_CHROMEOS)
558 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( 559 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
559 GetPrefs(), g_browser_process->local_state()); 560 GetPrefs(), g_browser_process->local_state());
560 } 561 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698