Update the web store promo to be clearer and configurable at run-time.

chrome/browser/profiles/profile_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_impl.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
 #include "chrome/browser/background_contents_service.h"
 #include "chrome/browser/background_mode_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_signin.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #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"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_pref_store.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/user_script_master.h"
@@ skipping 192 matching lines @@
 
 // static
 Profile* Profile::CreateProfile(const FilePath& path) {
   return new ProfileImpl(path);
 }
 
 // static
 void ProfileImpl::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false);
   prefs->RegisterBooleanPref(prefs::kClearSiteDataOnExit, false);
-  DefaultApps::RegisterUserPrefs(prefs);
 }
 
 ProfileImpl::ProfileImpl(const FilePath& path)
     : path_(path),
       visited_link_event_listener_(new VisitedLinkEventListener()),
       extension_devtools_manager_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(io_data_(this)),
       host_content_settings_map_(NULL),
       host_zoom_map_(NULL),
       history_service_created_(false),
@@ skipping 121 matching lines @@
 #endif
   extensions_service_ = new ExtensionService(
       this,
       CommandLine::ForCurrentProcess(),
       GetPath().AppendASCII(ExtensionService::kInstallDirectoryName),
       extension_prefs_.get(),
       autoupdate_enabled);
 
   RegisterComponentExtensions();
   extensions_service_->Init();
-  InstallDefaultApps();
 
   // Load any extensions specified with --load-extension.
   if (command_line->HasSwitch(switches::kLoadExtension)) {
     FilePath path = command_line->GetSwitchValuePath(switches::kLoadExtension);
     extensions_service_->LoadExtension(path);
   }
 
   // Make the chrome://extension-icon/ resource available.
   GetChromeURLDataManager()->AddDataSource(new ExtensionIconSource(this));
 }
@@ skipping 77 matching lines @@
         .AppendASCII("access_chromevox");
     std::string manifest =
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             IDR_CHROMEVOX_MANIFEST).as_string();
     extensions_service_->register_component_extension(
         ExtensionService::ComponentExtensionInfo(manifest, path));
   }
 #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;
 
   promo_resource_service_ = new PromoResourceService(this);
   promo_resource_service_->StartAfterDelay();
 }
 
 void ProfileImpl::InitRegisteredProtocolHandlers() {
   if (protocol_handler_registry_)
@@ skipping 993 matching lines @@
   return pref_proxy_config_tracker_;
 }
 
 prerender::PrerenderManager* ProfileImpl::GetPrerenderManager() {
   if (!prerender::PrerenderManager::IsPrerenderingPossible())
     return NULL;
   if (!prerender_manager_)
     prerender_manager_ = new prerender::PrerenderManager(this);
   return prerender_manager_;
 }