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

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

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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 | Annotate | Revision Log
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>
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 base::FilePath base_cache_path_; 196 base::FilePath base_cache_path_;
197 197
198 // !!! BIG HONKING WARNING !!! 198 // !!! BIG HONKING WARNING !!!
199 // The order of the members below is important. Do not change it unless 199 // The order of the members below is important. Do not change it unless
200 // you know what you're doing. Also, if adding a new member here make sure 200 // you know what you're doing. Also, if adding a new member here make sure
201 // that the declaration occurs AFTER things it depends on as destruction 201 // that the declaration occurs AFTER things it depends on as destruction
202 // happens in reverse order of declaration. 202 // happens in reverse order of declaration.
203 203
204 // TODO(mnissler, joaodasilva): The |profile_policy_connector_| provides the 204 // TODO(mnissler, joaodasilva): The |profile_policy_connector_| provides the
205 // PolicyService that the |prefs_| depend on, and must outlive |prefs_|. 205 // PolicyService that the |prefs_| depend on, and must outlive |prefs_|.
206 // This can be removed once |prefs_| becomes a ProfileKeyedService too. 206 // This can be removed once |prefs_| becomes a BrowserContextKeyedService too.
207 // |profile_policy_connector_| in turn depends on |cloud_policy_manager_|. 207 // |profile_policy_connector_| in turn depends on |cloud_policy_manager_|.
208 #if defined(ENABLE_CONFIGURATION_POLICY) 208 #if defined(ENABLE_CONFIGURATION_POLICY)
209 scoped_ptr<policy::CloudPolicyManager> cloud_policy_manager_; 209 scoped_ptr<policy::CloudPolicyManager> cloud_policy_manager_;
210 #endif 210 #endif
211 scoped_ptr<policy::ProfilePolicyConnector> profile_policy_connector_; 211 scoped_ptr<policy::ProfilePolicyConnector> profile_policy_connector_;
212 212
213 // Keep |prefs_| on top for destruction order because |extension_prefs_|, 213 // Keep |prefs_| on top for destruction order because |extension_prefs_|,
214 // |net_pref_observer_|, |io_data_| and others store pointers to |prefs_| and 214 // |net_pref_observer_|, |io_data_| and others store pointers to |prefs_| and
215 // shall be destructed first. 215 // shall be destructed first.
216 scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_; 216 scoped_refptr<user_prefs::PrefRegistrySyncable> pref_registry_;
(...skipping 29 matching lines...) Expand all
246 chromeos_enterprise_extension_observer_; 246 chromeos_enterprise_extension_observer_;
247 247
248 scoped_ptr<chromeos::LocaleChangeGuard> locale_change_guard_; 248 scoped_ptr<chromeos::LocaleChangeGuard> locale_change_guard_;
249 #endif 249 #endif
250 250
251 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 251 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
252 252
253 // STOP!!!! DO NOT ADD ANY MORE ITEMS HERE!!!! 253 // STOP!!!! DO NOT ADD ANY MORE ITEMS HERE!!!!
254 // 254 //
255 // Instead, make your Service/Manager/whatever object you're hanging off the 255 // Instead, make your Service/Manager/whatever object you're hanging off the
256 // Profile use our new ProfileKeyedServiceFactory system instead. You can 256 // Profile use our new BrowserContextKeyedServiceFactory system instead.
257 // find the design document here: 257 // You can find the design document here:
258 // 258 //
259 // https://sites.google.com/a/chromium.org/dev/developers/design-documents/p rofile-architecture 259 // https://sites.google.com/a/chromium.org/dev/developers/design-documents/p rofile-architecture
260 // 260 //
261 // and you can read the raw headers here: 261 // and you can read the raw headers here:
262 // 262 //
263 // chrome/browser/profile/profile_keyed_service.h 263 // components/browser_context_keyed_service/browser_context_dependency_manag er.{h,cc}
264 // chrome/browser/profile/profile_keyed_service_factory.{h,cc} 264 // components/browser_context_keyed_service/browser_context_keyed_service.h
265 // chrome/browser/profile/profile_keyed_dependency_manager.{h,cc} 265 // components/browser_context_keyed_service/browser_context_keyed_service_fa ctory.{h,cc}
266 266
267 Profile::Delegate* delegate_; 267 Profile::Delegate* delegate_;
268 268
269 chrome_browser_net::Predictor* predictor_; 269 chrome_browser_net::Predictor* predictor_;
270 270
271 DISALLOW_COPY_AND_ASSIGN(ProfileImpl); 271 DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
272 }; 272 };
273 273
274 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 274 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698