Moved app shortcut code out of ExtensionService.

chrome/browser/extensions/extension_service.cc

 // Copyright (c) 2012 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/extensions/extension_service.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/basictypes.h"
@@ skipping 58 matching lines @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sync/api/sync_change.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/global_error_service.h"
 #include "chrome/browser/ui/global_error_service_factory.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/ui/webui/favicon_source.h"
 #include "chrome/browser/ui/webui/ntp/thumbnail_source.h"
-#include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "googleurl/src/gurl.h"
-#include "grit/theme_resources.h"
 #include "net/base/registry_controlled_domain.h"
 #include "webkit/database/database_tracker.h"
 #include "webkit/database/database_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
@@ skipping 268 matching lines @@
       extensions_enabled_(extensions_enabled),
       show_extensions_prompts_(true),
       ready_(false),
       toolbar_model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       menu_manager_(profile),
       app_notification_manager_(new AppNotificationManager(profile)),
       apps_promo_(profile->GetPrefs()),
       event_routers_initialized_(false),
       extension_warnings_(profile),
       socket_controller_(NULL),
-      tracker_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+      app_shortcut_manager_(profile) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Figure out if extension installation should be enabled.
   if (command_line->HasSwitch(switches::kDisableExtensions)) {
     extensions_enabled_ = false;
   } else if (profile->GetPrefs()->GetBoolean(prefs::kDisableExtensions)) {
     extensions_enabled_ = false;
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_PROCESS_TERMINATED,
@@ skipping 1841 matching lines @@
   // the webRequest API), set the preference. Otherwise clear it, in case the
   // extension stopped using a relevant API.
   extension_prefs_->SetDelaysNetworkRequests(
       extension->id(), extension->ImplicitlyDelaysNetworkStartup());
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile_),
       content::Details<const Extension>(extension));
 
-  // Temporary feature to always install shortcuts for platform apps to
-  // facilitate early testing.
-  // TODO(benwells): Remove before launching platform apps.

[koz (OOO until 15th September), 2012/02/03 04:16:37]

It looks like this change preserves this behaviour, so should you move this TODO
into AppShortcutManager?

[benwells, 2012/02/03 04:37:38]

My understanding is the feature will stay, possibly with some control over what
shortcuts get installed and / or a change to what shortcuts get installed by
default. So I took out the TODO :)

-  if (extension->is_platform_app()) {
-      StartInstallApplicationShortcut(extension);
-  }
-
   // Transfer ownership of |extension| to AddExtension.
   AddExtension(scoped_extension);
 }
 
 const Extension* ExtensionService::GetExtensionByIdInternal(
     const std::string& id, bool include_enabled, bool include_disabled,
     bool include_terminated) const {
   std::string lowercase_id = StringToLowerASCII(id);
   if (include_enabled) {
     const Extension* extension = extensions_.GetByID(lowercase_id);
@@ skipping 354 matching lines @@
 ExtensionService::NaClModuleInfoList::iterator
     ExtensionService::FindNaClModule(const GURL& url) {
   for (NaClModuleInfoList::iterator iter = nacl_module_list_.begin();
        iter != nacl_module_list_.end(); ++iter) {
     if (iter->url == url)
       return iter;
   }
   return nacl_module_list_.end();
 }
 
-void ExtensionService::StartInstallApplicationShortcut(
-    const Extension* extension) {
-#if !defined(OS_MACOSX)
-  const int kAppIconSize = 32;
-
-  shortcut_info_.extension_id = extension->id();
-  shortcut_info_.url = GURL(extension->launch_web_url());
-  shortcut_info_.title = UTF8ToUTF16(extension->name());
-  shortcut_info_.description = UTF8ToUTF16(extension->description());
-  shortcut_info_.create_in_applications_menu = true;
-  shortcut_info_.create_in_quick_launch_bar = true;
-  shortcut_info_.create_on_desktop = true;
-
-  // The icon will be resized to |max_size|.
-  const gfx::Size max_size(kAppIconSize, kAppIconSize);
-
-  // Look for an icon. If there is no icon at the ideal size, we will resize
-  // whatever we can get. Making a large icon smaller is prefered to making a
-  // small icon larger, so look for a larger icon first:
-  ExtensionResource icon_resource = extension->GetIconResource(
-      kAppIconSize,
-      ExtensionIconSet::MATCH_BIGGER);
-
-  // If no icon exists that is the desired size or larger, get the
-  // largest icon available:
-  if (icon_resource.empty()) {
-    icon_resource = extension->GetIconResource(
-        kAppIconSize,
-        ExtensionIconSet::MATCH_SMALLER);
-  }
-
-  // icon_resource may still be empty at this point, in which case LoadImage
-  // which call the OnImageLoaded callback with a NULL image and exit
-  // immediately.
-  tracker_.LoadImage(extension,
-                     icon_resource,
-                     max_size,
-                     ImageLoadingTracker::DONT_CACHE);
-#endif
-}
-
-void ExtensionService::OnImageLoaded(SkBitmap *image,
-                                     const ExtensionResource &resource,
-                                     int index) {
-  // If the image failed to load (e.g. if the resource being loaded was empty)
-  // use the standard application icon.
-  if (!image || image->isNull())
-    image = ExtensionIconSource::LoadImageByResourceId(IDR_APP_DEFAULT_ICON);
-
-  shortcut_info_.favicon = *image;
-  web_app::CreateShortcut(profile_->GetPath(), shortcut_info_);
-}
-
 extensions::SocketController* ExtensionService::socket_controller() {
   // TODO(miket): Find a better place for SocketController to live. It needs
   // to be scoped such that it can be created and destroyed on the IO thread.
   //
   // To coexist with certain unit tests that don't have an IO thread message
   // loop available at ExtensionService shutdown, we lazy-initialize this
   // object so that those cases neither create nor destroy a SocketController.
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!socket_controller_) {
     socket_controller_ = new extensions::SocketController();
   }
   return socket_controller_;
 }