| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/profile_impl.h" | 5 #include "chrome/browser/profile_impl.h" |
| 6 | 6 |
| 7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/environment.h" | 9 #include "base/environment.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 502 // by the time the destructor has finished we're sure it will no longer call | 502 // by the time the destructor has finished we're sure it will no longer call |
| 503 // into the BookmarkModel. | 503 // into the BookmarkModel. |
| 504 history_service_ = NULL; | 504 history_service_ = NULL; |
| 505 bookmark_bar_model_.reset(); | 505 bookmark_bar_model_.reset(); |
| 506 | 506 |
| 507 // FaviconService depends on HistoryServce so make sure we delete | 507 // FaviconService depends on HistoryServce so make sure we delete |
| 508 // HistoryService first. | 508 // HistoryService first. |
| 509 favicon_service_ = NULL; | 509 favicon_service_ = NULL; |
| 510 | 510 |
| 511 if (extension_message_service_) | 511 if (extension_message_service_) |
| 512 extension_message_service_->ProfileDestroyed(); | 512 extension_message_service_->DestroyingProfile(); |
| 513 | 513 |
| 514 if (extensions_service_) | 514 if (extensions_service_) |
| 515 extensions_service_->ProfileDestroyed(); | 515 extensions_service_->DestroyingProfile(); |
| 516 | 516 |
| 517 // This causes the Preferences file to be written to disk. | 517 // This causes the Preferences file to be written to disk. |
| 518 MarkAsCleanShutdown(); | 518 MarkAsCleanShutdown(); |
| 519 } | 519 } |
| 520 | 520 |
| 521 ProfileId ProfileImpl::GetRuntimeId() { | 521 ProfileId ProfileImpl::GetRuntimeId() { |
| 522 return reinterpret_cast<ProfileId>(this); | 522 return reinterpret_cast<ProfileId>(this); |
| 523 } | 523 } |
| 524 | 524 |
| 525 FilePath ProfileImpl::GetPath() { | 525 FilePath ProfileImpl::GetPath() { |
| (...skipping 680 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1206 new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess())); | 1206 new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess())); |
| 1207 sync_service_.reset( | 1207 sync_service_.reset( |
| 1208 profile_sync_factory_->CreateProfileSyncService()); | 1208 profile_sync_factory_->CreateProfileSyncService()); |
| 1209 sync_service_->Initialize(); | 1209 sync_service_->Initialize(); |
| 1210 } | 1210 } |
| 1211 | 1211 |
| 1212 void ProfileImpl::InitCloudPrintProxyService() { | 1212 void ProfileImpl::InitCloudPrintProxyService() { |
| 1213 cloud_print_proxy_service_.reset(new CloudPrintProxyService(this)); | 1213 cloud_print_proxy_service_.reset(new CloudPrintProxyService(this)); |
| 1214 cloud_print_proxy_service_->Initialize(); | 1214 cloud_print_proxy_service_->Initialize(); |
| 1215 } | 1215 } |
| OLD | NEW |