Make some updates to extension iconography.

chrome/browser/extensions/api/omnibox/omnibox_api.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/api/omnibox/omnibox_api.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 27 matching lines @@
 namespace {
 
 const char kSuggestionContent[] = "content";
 const char kCurrentTabDisposition[] = "currentTab";
 const char kForegroundTabDisposition[] = "newForegroundTab";
 const char kBackgroundTabDisposition[] = "newBackgroundTab";
 
 // Pref key for omnibox.setDefaultSuggestion.
 const char kOmniboxDefaultSuggestion[] = "omnibox_default_suggestion";
 
-#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
-
 std::unique_ptr<omnibox::SuggestResult> GetOmniboxDefaultSuggestion(
     Profile* profile,
     const std::string& extension_id) {
   ExtensionPrefs* prefs = ExtensionPrefs::Get(profile);
 
   std::unique_ptr<omnibox::SuggestResult> suggestion;
   const base::DictionaryValue* dict = NULL;
   if (prefs && prefs->ReadPrefAsDictionary(extension_id,
                                            kOmniboxDefaultSuggestion,
                                            &dict)) {
@@ skipping 119 matching lines @@
       url_service_(TemplateURLServiceFactory::GetForProfile(profile_)),
       extension_registry_observer_(this) {
   extension_registry_observer_.Add(ExtensionRegistry::Get(profile_));
   if (url_service_) {
     template_url_sub_ = url_service_->RegisterOnLoadedCallback(
         base::Bind(&OmniboxAPI::OnTemplateURLsLoaded,
                    base::Unretained(this)));
   }
 
   // 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));
 }
 
 void OmniboxAPI::Shutdown() {
   template_url_sub_.reset();
 }
 
 OmniboxAPI::~OmniboxAPI() {
 }
 
 static base::LazyInstance<BrowserContextKeyedAPIFactory<OmniboxAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 BrowserContextKeyedAPIFactory<OmniboxAPI>* OmniboxAPI::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 // static
 OmniboxAPI* OmniboxAPI::Get(content::BrowserContext* context) {
   return BrowserContextKeyedAPIFactory<OmniboxAPI>::Get(context);
 }
 
 void OmniboxAPI::OnExtensionLoaded(content::BrowserContext* browser_context,
                                    const Extension* extension) {
   const std::string& keyword = OmniboxInfo::GetKeyword(extension);
   if (!keyword.empty()) {
     // Load the omnibox icon so it will be ready to display in the URL bar.
-    omnibox_popup_icon_manager_.LoadIcon(profile_, extension);
     omnibox_icon_manager_.LoadIcon(profile_, extension);
 
     if (url_service_) {
       url_service_->Load();
       if (url_service_->loaded()) {
         url_service_->RegisterOmniboxKeyword(
             extension->id(), extension->name(), keyword,
             GetTemplateURLStringForExtension(extension->id()));
       } else {
         pending_extensions_.insert(extension);
       }
     }
   }
 }
 
 void OmniboxAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
                                      const Extension* extension,
                                      UnloadedExtensionInfo::Reason reason) {
   if (!OmniboxInfo::GetKeyword(extension).empty() && url_service_) {
     if (url_service_->loaded()) {
       url_service_->RemoveExtensionControlledTURL(
           extension->id(), TemplateURL::OMNIBOX_API_EXTENSION);
     } else {
       pending_extensions_.erase(extension);
     }
   }
 }
 
 gfx::Image OmniboxAPI::GetOmniboxIcon(const std::string& extension_id) {
-  return gfx::Image::CreateFrom1xBitmap(
-      omnibox_icon_manager_.GetIcon(extension_id));
-}
-
-gfx::Image OmniboxAPI::GetOmniboxPopupIcon(const std::string& extension_id) {
-  return gfx::Image::CreateFrom1xBitmap(
-      omnibox_popup_icon_manager_.GetIcon(extension_id));
+  return omnibox_icon_manager_.GetIcon(extension_id);
 }
 
 void OmniboxAPI::OnTemplateURLsLoaded() {
   // Register keywords for pending extensions.
   template_url_sub_.reset();
   for (PendingExtensions::const_iterator i(pending_extensions_.begin());
        i != pending_extensions_.end(); ++i) {
     url_service_->RegisterOmniboxKeyword(
         (*i)->id(), (*i)->name(), OmniboxInfo::GetKeyword(*i),
         GetTemplateURLStringForExtension((*i)->id()));
@@ skipping 119 matching lines @@
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(description);
 }
 
 }  // namespace extensions