Implement new strategy for default apps

chrome/browser/profile_impl.cc

 // Copyright (c) 2010 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/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "chrome/browser/appcache/chrome_appcache_service.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_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_blob_storage_context.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/ntp_resource_cache.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_info_map.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/user_script_master.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/file_system/file_system_host_context.h"
 #include "chrome/browser/find_bar_state.h"
@@ skipping 122 matching lines @@
 
 FilePath GetMediaCachePath(const FilePath& base) {
   return base.Append(chrome::kMediaCacheDirname);
 }
 
 bool HasACacheSubdir(const FilePath &dir) {
   return file_util::PathExists(GetCachePath(dir)) ||
          file_util::PathExists(GetMediaCachePath(dir));
 }
 
-// Returns true if the default apps should be loaded (so that the app panel is
-// not empty).
-bool IncludeDefaultApps() {
-#if defined(OS_CHROMEOS) && defined(GOOGLE_CHROME_BUILD)
-  return true;
-#endif
-  return false;
-}
-
 // Simple task to log the size of the current profile.
 class ProfileSizeTask : public Task {
  public:
   explicit ProfileSizeTask(const FilePath& path) : path_(path) {}
   virtual ~ProfileSizeTask() {}
 
   virtual void Run();
  private:
   FilePath path_;
 };
@@ skipping 43 matching lines @@
 }  // namespace
 
 // static
 Profile* Profile::CreateProfile(const FilePath& path) {
   return new ProfileImpl(path);
 }
 
 // static
 void ProfileImpl::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kSavingBrowserHistoryDisabled, false);
+  DefaultApps::RegisterUserPrefs(prefs);
 }
 
 ProfileImpl::ProfileImpl(const FilePath& path)
     : path_(path),
       visited_link_event_listener_(new VisitedLinkEventListener()),
       extension_devtools_manager_(NULL),
       request_context_(NULL),
       media_request_context_(NULL),
       extensions_request_context_(NULL),
       host_content_settings_map_(NULL),
@@ skipping 115 matching lines @@
                         // TODO(aa): We should just remove this functionality,
                         // since it isn't used anymore.
   user_script_master_ = new UserScriptMaster(script_dir, this);
 
   extensions_service_ = new ExtensionsService(
       this,
       CommandLine::ForCurrentProcess(),
       GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName),
       true);
 
+  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);
+  }
+}
+
+void ProfileImpl::RegisterComponentExtensions() {
   // Register the component extensions.
   typedef std::list<std::pair<std::string, int> > ComponentExtensionList;
   ComponentExtensionList component_extensions;
 
   // Bookmark manager.
   component_extensions.push_back(
       std::make_pair("bookmark_manager", IDR_BOOKMARKS_MANIFEST));
 
 #if defined(TOUCH_UI)
   component_extensions.push_back(
       std::make_pair("keyboard", IDR_KEYBOARD_MANIFEST));
 #endif
 
   // Web Store.
   component_extensions.push_back(
       std::make_pair("web_store", IDR_WEBSTORE_MANIFEST));
 
-  // Some sample apps to make our lives easier while we are developing extension
-  // apps. This way we don't have to constantly install these over and over.
-  if (Extension::AppsAreEnabled() && IncludeDefaultApps()) {
-    component_extensions.push_back(
-        std::make_pair("gmail_app", IDR_GMAIL_APP_MANIFEST));
-    component_extensions.push_back(
-        std::make_pair("calendar_app", IDR_CALENDAR_APP_MANIFEST));
-    component_extensions.push_back(
-        std::make_pair("docs_app", IDR_DOCS_APP_MANIFEST));
-  }
-
 #if defined(OS_CHROMEOS) && defined(GOOGLE_CHROME_BUILD)
-  if (Extension::AppsAreEnabled()) {
-    component_extensions.push_back(
-        std::make_pair("chat_manager", IDR_TALK_APP_MANIFEST));
-  }
+  component_extensions.push_back(
+      std::make_pair("chat_manager", IDR_TALK_APP_MANIFEST));
 #endif
 
   for (ComponentExtensionList::iterator iter = component_extensions.begin();
     iter != component_extensions.end(); ++iter) {
     FilePath path;
     if (PathService::Get(chrome::DIR_RESOURCES, &path)) {
       path = path.AppendASCII(iter->first);
     } else {
       NOTREACHED();
     }
 
     std::string manifest =
         ResourceBundle::GetSharedInstance().GetRawDataResource(
             iter->second).as_string();
     extensions_service_->register_component_extension(
         ExtensionsService::ComponentExtensionInfo(manifest, path));
   }
+}
 
-  extensions_service_->Init();
+void ProfileImpl::InstallDefaultApps() {
+#if !defined(OS_CHROMEOS)
+  // On desktop Chrome, we don't have default apps on by, err, default yet.
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableDefaultApps)) {
+    return;
+  }
+#endif
 
-  // Load any extensions specified with --load-extension.
-  if (command_line->HasSwitch(switches::kLoadExtension)) {
-    FilePath path = command_line->GetSwitchValuePath(switches::kLoadExtension);
-    extensions_service_->LoadExtension(path);
+  // The web store only supports en-US at the moment, so we don't install
+  // default apps in other locales.
+  if (g_browser_process->GetApplicationLocale() != "en-US")
+    return;
+
+  ExtensionsService* extensions_service = GetExtensionsService();
+  const ExtensionIdSet* app_ids =
+      extensions_service->default_apps()->GetAppsToInstall();
+  if (!app_ids)
+    return;
+
+  for (ExtensionIdSet::const_iterator iter = app_ids->begin();
+       iter != app_ids->end(); ++iter) {
+    extensions_service->AddPendingExtensionFromDefaultAppList(*iter);
   }
 }
 
 void ProfileImpl::InitWebResources() {
   if (web_resource_service_)
     return;
 
   web_resource_service_ = new WebResourceService(this);
   web_resource_service_->StartAfterDelay();
 }
@@ skipping 819 matching lines @@
 #if defined(OS_CHROMEOS)
 chromeos::ProxyConfigServiceImpl*
     ProfileImpl::GetChromeOSProxyConfigServiceImpl() {
   if (!chromeos_proxy_config_service_impl_) {
     chromeos_proxy_config_service_impl_ =
         new chromeos::ProxyConfigServiceImpl();
   }
   return chromeos_proxy_config_service_impl_;
 }
 #endif  // defined(OS_CHROMEOS)