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

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

Issue 6894027: Initial refactoring complete Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed some tests that were broken by previous refactoring Created 9 years, 8 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profile_impl.h" 5 #include "chrome/browser/profiles/profile_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/environment.h" 9 #include "base/environment.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 24 matching lines...) Expand all
35 #include "chrome/browser/extensions/extension_process_manager.h" 35 #include "chrome/browser/extensions/extension_process_manager.h"
36 #include "chrome/browser/extensions/extension_service.h" 36 #include "chrome/browser/extensions/extension_service.h"
37 #include "chrome/browser/extensions/extension_special_storage_policy.h" 37 #include "chrome/browser/extensions/extension_special_storage_policy.h"
38 #include "chrome/browser/extensions/user_script_master.h" 38 #include "chrome/browser/extensions/user_script_master.h"
39 #include "chrome/browser/favicon_service.h" 39 #include "chrome/browser/favicon_service.h"
40 #include "chrome/browser/geolocation/geolocation_content_settings_map.h" 40 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
41 #include "chrome/browser/history/history.h" 41 #include "chrome/browser/history/history.h"
42 #include "chrome/browser/history/top_sites.h" 42 #include "chrome/browser/history/top_sites.h"
43 #include "chrome/browser/instant/instant_controller.h" 43 #include "chrome/browser/instant/instant_controller.h"
44 #include "chrome/browser/net/chrome_url_request_context.h" 44 #include "chrome/browser/net/chrome_url_request_context.h"
45 #include "chrome/browser/net/gaia/authentication_service.h"
45 #include "chrome/browser/net/gaia/token_service.h" 46 #include "chrome/browser/net/gaia/token_service.h"
46 #include "chrome/browser/net/net_pref_observer.h" 47 #include "chrome/browser/net/net_pref_observer.h"
47 #include "chrome/browser/net/pref_proxy_config_service.h" 48 #include "chrome/browser/net/pref_proxy_config_service.h"
48 #include "chrome/browser/net/ssl_config_service_manager.h" 49 #include "chrome/browser/net/ssl_config_service_manager.h"
49 #include "chrome/browser/notifications/desktop_notification_service.h" 50 #include "chrome/browser/notifications/desktop_notification_service.h"
50 #include "chrome/browser/password_manager/password_store_default.h" 51 #include "chrome/browser/password_manager/password_store_default.h"
51 #include "chrome/browser/policy/configuration_policy_pref_store.h" 52 #include "chrome/browser/policy/configuration_policy_pref_store.h"
52 #include "chrome/browser/policy/configuration_policy_provider.h" 53 #include "chrome/browser/policy/configuration_policy_provider.h"
53 #include "chrome/browser/policy/profile_policy_connector.h" 54 #include "chrome/browser/policy/profile_policy_connector.h"
54 #include "chrome/browser/prefs/browser_prefs.h" 55 #include "chrome/browser/prefs/browser_prefs.h"
(...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1286 GetProfileSyncService(); // Causes lazy-load if sync is enabled. 1287 GetProfileSyncService(); // Causes lazy-load if sync is enabled.
1287 registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED, 1288 registrar_.Remove(this, NotificationType::BOOKMARK_MODEL_LOADED,
1288 Source<Profile>(this)); 1289 Source<Profile>(this));
1289 } 1290 }
1290 } 1291 }
1291 1292
1292 void ProfileImpl::StopCreateSessionServiceTimer() { 1293 void ProfileImpl::StopCreateSessionServiceTimer() {
1293 create_session_service_timer_.Stop(); 1294 create_session_service_timer_.Stop();
1294 } 1295 }
1295 1296
1297 AuthenticationService* ProfileImpl::GetAuthenticationService() {
1298 if (!authentication_service_.get()) {
1299 authentication_service_.reset(new AuthenticationService());
1300 }
1301 return authentication_service_.get();
1302 }
1303
1296 TokenService* ProfileImpl::GetTokenService() { 1304 TokenService* ProfileImpl::GetTokenService() {
1297 if (!token_service_.get()) { 1305 if (!token_service_.get()) {
1298 token_service_.reset(new TokenService()); 1306 token_service_.reset(new TokenService());
1299 } 1307 }
1300 return token_service_.get(); 1308 return token_service_.get();
1301 } 1309 }
1302 1310
1303 ProfileSyncService* ProfileImpl::GetProfileSyncService() { 1311 ProfileSyncService* ProfileImpl::GetProfileSyncService() {
1304 #if defined(OS_CHROMEOS) 1312 #if defined(OS_CHROMEOS)
1305 if (!sync_service_.get()) { 1313 if (!sync_service_.get()) {
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 return pref_proxy_config_tracker_; 1507 return pref_proxy_config_tracker_;
1500 } 1508 }
1501 1509
1502 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() { 1510 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
1503 if (!prerender::PrerenderManager::IsPrerenderingPossible()) 1511 if (!prerender::PrerenderManager::IsPrerenderingPossible())
1504 return NULL; 1512 return NULL;
1505 if (!prerender_manager_) 1513 if (!prerender_manager_)
1506 prerender_manager_ = new prerender::PrerenderManager(this); 1514 prerender_manager_ = new prerender::PrerenderManager(this);
1507 return prerender_manager_; 1515 return prerender_manager_;
1508 } 1516 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/remoting/setup_flow_login_step.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698