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

Side by Side Diff: chrome/browser/profiles/profile_impl.h

Issue 10783006: Removing ENABLE_PROMO_RESOURCE_SERVICE guards (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: TODO to remove kNtpCustomLogo Created 8 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 unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // This class gathers state related to a single user profile. 5 // This class gathers state related to a single user profile.
6 6
7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
9 9
10 #include <string> 10 #include <string>
11 11
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/timer.h" 16 #include "base/timer.h"
17 #include "chrome/browser/prefs/pref_change_registrar.h" 17 #include "chrome/browser/prefs/pref_change_registrar.h"
18 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/profiles/profile_impl_io_data.h" 19 #include "chrome/browser/profiles/profile_impl_io_data.h"
20 #include "content/public/browser/notification_observer.h" 20 #include "content/public/browser/notification_observer.h"
21 #include "content/public/browser/notification_registrar.h" 21 #include "content/public/browser/notification_registrar.h"
22 22
23 class ExtensionNavigationObserver; 23 class ExtensionNavigationObserver;
24 class NetPrefObserver; 24 class NetPrefObserver;
25 class PrefService; 25 class PrefService;
26 class PromoResourceService;
26 class SSLConfigServiceManager; 27 class SSLConfigServiceManager;
27 class VisitedLinkEventListener; 28 class VisitedLinkEventListener;
28 29
29 #if defined(ENABLE_PROMO_RESOURCE_SERVICE)
30 class PromoResourceService;
31 #endif
32
33 #if defined(OS_CHROMEOS) 30 #if defined(OS_CHROMEOS)
34 namespace chromeos { 31 namespace chromeos {
35 class EnterpriseExtensionObserver; 32 class EnterpriseExtensionObserver;
36 class LocaleChangeGuard; 33 class LocaleChangeGuard;
37 class Preferences; 34 class Preferences;
38 } 35 }
39 #endif 36 #endif
40 37
41 namespace content { 38 namespace content {
42 class SpeechRecognitionPreferences; 39 class SpeechRecognitionPreferences;
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 // pointers to |prefs_| and shall be destructed first. 200 // pointers to |prefs_| and shall be destructed first.
204 scoped_ptr<PrefService> prefs_; 201 scoped_ptr<PrefService> prefs_;
205 scoped_ptr<PrefService> otr_prefs_; 202 scoped_ptr<PrefService> otr_prefs_;
206 scoped_ptr<VisitedLinkEventListener> visited_link_event_listener_; 203 scoped_ptr<VisitedLinkEventListener> visited_link_event_listener_;
207 scoped_ptr<VisitedLinkMaster> visited_link_master_; 204 scoped_ptr<VisitedLinkMaster> visited_link_master_;
208 ProfileImplIOData::Handle io_data_; 205 ProfileImplIOData::Handle io_data_;
209 scoped_refptr<ExtensionSpecialStoragePolicy> 206 scoped_refptr<ExtensionSpecialStoragePolicy>
210 extension_special_storage_policy_; 207 extension_special_storage_policy_;
211 scoped_ptr<NetPrefObserver> net_pref_observer_; 208 scoped_ptr<NetPrefObserver> net_pref_observer_;
212 209
213 #if defined(ENABLE_PROMO_RESOURCE_SERVICE)
214 scoped_refptr<PromoResourceService> promo_resource_service_; 210 scoped_refptr<PromoResourceService> promo_resource_service_;
215 #endif
216 211
217 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_; 212 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_;
218 213
219 scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_; 214 scoped_ptr<SSLConfigServiceManager> ssl_config_service_manager_;
220 215
221 scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 216 scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
222 scoped_refptr<content::GeolocationPermissionContext> 217 scoped_refptr<content::GeolocationPermissionContext>
223 geolocation_permission_context_; 218 geolocation_permission_context_;
224 scoped_ptr<GAIAInfoUpdateService> gaia_info_update_service_; 219 scoped_ptr<GAIAInfoUpdateService> gaia_info_update_service_;
225 scoped_ptr<FaviconService> favicon_service_; 220 scoped_ptr<FaviconService> favicon_service_;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 Profile::Delegate* delegate_; 263 Profile::Delegate* delegate_;
269 264
270 chrome_browser_net::Predictor* predictor_; 265 chrome_browser_net::Predictor* predictor_;
271 266
272 bool session_restore_enabled_; 267 bool session_restore_enabled_;
273 268
274 DISALLOW_COPY_AND_ASSIGN(ProfileImpl); 269 DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
275 }; 270 };
276 271
277 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 272 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698