Use the extension icon for extension omnibox results instead of the generic

chrome/browser/extensions/extensions_service.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/extensions/extensions_service.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
@@ skipping 168 matching lines @@
   if (autoupdate_enabled) {
     int update_frequency = kDefaultUpdateFrequencySeconds;
     if (command_line->HasSwitch(switches::kExtensionsUpdateFrequency)) {
       update_frequency = StringToInt(command_line->GetSwitchValueASCII(
           switches::kExtensionsUpdateFrequency));
     }
     updater_ = new ExtensionUpdater(this, prefs, update_frequency);
   }
 
   backend_ = new ExtensionsServiceBackend(install_directory_);
+
+  // Use monochrome icons for omnibox icons.
+  omnibox_icon_manager_.set_monochrome(true);
 }
 
 ExtensionsService::~ExtensionsService() {
   UnloadAllExtensions();
   if (updater_.get()) {
     updater_->Stop();
   }
 }
 
 void ExtensionsService::InitEventRouters() {
@@ skipping 700 matching lines @@
         break;
     }
   }
 
   extension->set_being_upgraded(false);
 
   UpdateActiveExtensionsInCrashReporter();
 
   if (profile_->GetTemplateURLModel())
     profile_->GetTemplateURLModel()->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_icon_manager_.LoadIcon(extension);
 }
 
 void ExtensionsService::UpdateActiveExtensionsInCrashReporter() {
   std::set<std::string> extension_ids;
   for (size_t i = 0; i < extensions_.size(); ++i) {
     if (!extensions_[i]->is_theme())
       extension_ids.insert(extensions_[i]->id());
   }
 
   child_process_logging::SetActiveExtensions(extension_ids);
@@ skipping 103 matching lines @@
 Extension* ExtensionsService::GetExtensionByOverlappingWebExtent(
     const ExtensionExtent& extent) {
   for (size_t i = 0; i < extensions_.size(); ++i) {
     if (extensions_[i]->web_extent().OverlapsWith(extent))
       return extensions_[i];
   }
 
   return NULL;
 }
 
+const SkBitmap& ExtensionsService::GetOmniboxIcon(
+    const std::string& extension_id) {
+  return omnibox_icon_manager_.GetIcon(extension_id);
+}
+
 void ExtensionsService::ClearProvidersForTesting() {
   ChromeThread::PostTask(
       ChromeThread::FILE, FROM_HERE,
       NewRunnableMethod(
           backend_.get(), &ExtensionsServiceBackend::ClearProvidersForTesting));
 }
 
 void ExtensionsService::SetProviderForTesting(
     Extension::Location location, ExternalExtensionProvider* test_provider) {
   ChromeThread::PostTask(
@@ skipping 265 matching lines @@
   // Finish installing on UI thread.
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(
           frontend_,
           &ExtensionsService::ContinueLoadAllExtensions,
           extensions_to_reload,
           start_time,
           true));
 }