| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index b0148d146e43bd18bbe3345cb30a482217adc50b..93f2357b8c97db8bbac524130b6923d397071d33 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -25,7 +25,6 @@
|
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
|
| #include "chrome/browser/defaults.h"
|
| #include "chrome/browser/download/download_manager.h"
|
| -#include "chrome/browser/extensions/default_apps.h"
|
| #include "chrome/browser/extensions/extension_devtools_manager.h"
|
| #include "chrome/browser/extensions/extension_error_reporter.h"
|
| #include "chrome/browser/extensions/extension_event_router.h"
|
| @@ -238,7 +237,6 @@ Profile* Profile::CreateProfile(const FilePath& path) {
|
| void ProfileImpl::RegisterUserPrefs(PrefService* prefs) {
|
| prefs->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false);
|
| prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false);
|
| - DefaultApps::RegisterUserPrefs(prefs);
|
| }
|
|
|
| ProfileImpl::ProfileImpl(const FilePath& path)
|
| @@ -380,7 +378,6 @@ void ProfileImpl::InitExtensions() {
|
|
|
| RegisterComponentExtensions();
|
| extensions_service_->Init();
|
| - InstallDefaultApps();
|
|
|
| // Load any extensions specified with --load-extension.
|
| if (command_line->HasSwitch(switches::kLoadExtension)) {
|
| @@ -478,22 +475,6 @@ void ProfileImpl::RegisterComponentExtensions() {
|
| #endif
|
| }
|
|
|
| -void ProfileImpl::InstallDefaultApps() {
|
| - ExtensionService* extension_service = GetExtensionService();
|
| - DefaultApps* default_apps = extension_service->default_apps();
|
| -
|
| - if (!default_apps->ShouldInstallDefaultApps(extension_service->GetAppIds()))
|
| - return;
|
| -
|
| - const ExtensionIdSet& app_ids = default_apps->default_apps();
|
| - PendingExtensionManager* pending_extension_manager =
|
| - extension_service->pending_extension_manager();
|
| - for (ExtensionIdSet::const_iterator iter = app_ids.begin();
|
| - iter != app_ids.end(); ++iter) {
|
| - pending_extension_manager->AddFromDefaultAppList(*iter);
|
| - }
|
| -}
|
| -
|
| void ProfileImpl::InitPromoResources() {
|
| if (promo_resource_service_)
|
| return;
|
|
|