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

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 6825052: Update the web store promo to be clearer and configurable at run-time. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Incorporate feedback. Update feed format. Remove first run tip for most visited section. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index 0c96141ae3aac25bde60dc205dafb0aab664d6f0..890fa339c7366343bbd00ddcaebbd1414897c1ad 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"
@@ -237,7 +236,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)
@@ -379,7 +377,6 @@ void ProfileImpl::InitExtensions() {
RegisterComponentExtensions();
extensions_service_->Init();
- InstallDefaultApps();
// Load any extensions specified with --load-extension.
if (command_line->HasSwitch(switches::kLoadExtension)) {
@@ -477,22 +474,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;

Powered by Google App Engine
This is Rietveld 408576698