SupportsUserData and manifest handlers for Extension; use them for the Omnibox API.

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 <iterator>
 #include <set>
 
@@ skipping 142 matching lines @@
 // Histogram values for logging events related to externally installed
 // extensions.
 enum ExternalExtensionEvent {
   EXTERNAL_EXTENSION_INSTALLED = 0,
   EXTERNAL_EXTENSION_IGNORED,
   EXTERNAL_EXTENSION_REENABLED,
   EXTERNAL_EXTENSION_UNINSTALLED,
   EXTERNAL_EXTENSION_BUCKET_BOUNDARY,
 };
 
-#if defined(OS_LINUX)
-static const int kOmniboxIconPaddingLeft = 2;
-static const int kOmniboxIconPaddingRight = 2;
-#elif defined(OS_MACOSX)
-static const int kOmniboxIconPaddingLeft = 0;
-static const int kOmniboxIconPaddingRight = 2;
-#else
-static const int kOmniboxIconPaddingLeft = 0;
-static const int kOmniboxIconPaddingRight = 0;
-#endif
-
 // Prompt the user this many times before considering an extension acknowledged.
 static const int kMaxExtensionAcknowledgePromptCount = 3;
 
 // Wait this many seconds after an extensions becomes idle before updating it.
 static const int kUpdateIdleDelay = 5;
 
 // Wait this many seconds before trying to garbage collect extensions again.
 static const int kGarbageCollectRetryDelay = 30;
 
 const char* kNaClPluginMimeType = "application/x-nacl";
@@ skipping 246 matching lines @@
   app_notification_manager_->Init();
 
   if (extensions_enabled_) {
     if (!command_line->HasSwitch(switches::kImport) &&
         !command_line->HasSwitch(switches::kImportFromFile)) {
       extensions::ExternalProviderImpl::CreateExternalProviders(
           this, profile_, &external_extension_providers_);
     }
   }
 
-  // Use monochrome icons for Omnibox icons.
-  omnibox_popup_icon_manager_.set_monochrome(true);
-  omnibox_icon_manager_.set_monochrome(true);
-  omnibox_icon_manager_.set_padding(gfx::Insets(0, kOmniboxIconPaddingLeft,
-                                                0, kOmniboxIconPaddingRight));
-
   // Set this as the ExtensionService for extension sorting to ensure it
   // cause syncs if required.
   extension_prefs_->extension_sorting()->SetExtensionService(this);
 
 #if defined(ENABLE_EXTENSIONS)
   extension_action_storage_manager_.reset(
       new extensions::ExtensionActionStorageManager(profile_));
 #endif
 
   // How long is the path to the Extensions directory?
@@ skipping 652 matching lines @@
   UpdateActiveExtensionsInCrashReporter();
 
   ExtensionWebUI::RegisterChromeURLOverrides(
       profile_, extension->GetChromeURLOverrides());
 
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile_);
   if (url_service)
     url_service->RegisterExtensionKeyword(extension);
 
-  // Load the icon for omnibox-enabled extensions so it will be ready to display
-  // in the URL bar.
-  if (!extension->omnibox_keyword().empty()) {
-    omnibox_popup_icon_manager_.LoadIcon(extension);
-    omnibox_icon_manager_.LoadIcon(extension);
-  }
-
   // If the extension has permission to load chrome://favicon/ resources we need
   // to make sure that the FaviconSource is registered with the
   // ChromeURLDataManager.
   if (extension->HasHostPermission(GURL(chrome::kChromeUIFaviconURL))) {
     FaviconSource* favicon_source = new FaviconSource(profile_,
                                                       FaviconSource::FAVICON);
     ChromeURLDataManager::AddDataSource(profile_, favicon_source);
   }
 
 #if !defined(OS_ANDROID)
@@ skipping 1483 matching lines @@
   const Extension* extension = extensions_.GetExtensionOrAppByURL(
       ExtensionURLInfo(*url));
   if (extension && extension->is_platform_app()) {
     *url = GURL(chrome::kExtensionInvalidRequestURL);
     return true;
   }
 
   return false;
 }
 
-gfx::Image ExtensionService::GetOmniboxIcon(
-    const std::string& extension_id) {
-  return gfx::Image(omnibox_icon_manager_.GetIcon(extension_id));
-}
-
-gfx::Image ExtensionService::GetOmniboxPopupIcon(
-    const std::string& extension_id) {
-  return gfx::Image(omnibox_popup_icon_manager_.GetIcon(extension_id));
-}
-
 bool ExtensionService::OnExternalExtensionFileFound(
          const std::string& id,
          const Version* version,
          const FilePath& path,
          Extension::Location location,
          int creation_flags,
          bool mark_acknowledged) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   CHECK(Extension::IdIsValid(id));
   if (extension_prefs_->IsExternalExtensionUninstalled(id))
@@ skipping 503 matching lines @@
     scoped_refptr<const Extension> extension = GetInstalledExtension(*it);
     DCHECK(extension);
     if (!extension)
       continue;
     blacklisted_extensions_.Insert(extension);
     UnloadExtension(*it, extension_misc::UNLOAD_REASON_BLACKLIST);
   }
 
   IdentifyAlertableExtensions();
 }