Generalize ExtensionIconSet to store icon paths for custom size sets

chrome/browser/ui/ash/app_list/search_builder.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/ui/ash/app_list/search_builder.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/autocomplete/extension_app_provider.h"
 #include "chrome/browser/event_disposition.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/extension_utils.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/search_result.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 87 matching lines @@
         IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type);
     SetIcon(*ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
         resource_id));
   }
 
   void LoadExtensionIcon(const extensions::Extension* extension) {
     tracker_.reset(new ImageLoadingTracker(this));
     // TODO(xiyuan): Fix this for HD.
     tracker_->LoadImage(extension,
                         extension->GetIconResource(
-                            ExtensionIconSet::EXTENSION_ICON_SMALL,
+                            extension_misc::EXTENSION_ICON_SMALL,
                             ExtensionIconSet::MATCH_BIGGER),
-                        gfx::Size(ExtensionIconSet::EXTENSION_ICON_SMALL,
-                                  ExtensionIconSet::EXTENSION_ICON_SMALL),
+                        gfx::Size(extension_misc::EXTENSION_ICON_SMALL,
+                                  extension_misc::EXTENSION_ICON_SMALL),
                         ImageLoadingTracker::DONT_CACHE);
   }
 
   void UpdateTitleAndDetails() {
     set_title(match_.contents);
     app_list::SearchResult::Tags title_tags;
     ACMatchClassificationsToTags(match_.contents,
                                  match_.contents_class,
                                  &title_tags);
     set_title_tags(title_tags);
@@ skipping 131 matching lines @@
        ++it) {
     results_->Add(new SearchBuilderResult(profile_, *it));
   }
 }
 
 void SearchBuilder::OnResultChanged(bool default_match_changed) {
   // TODO(xiyuan): Handle default match properly.
   const AutocompleteResult& ac_result = controller_->result();
   PopulateFromACResult(ac_result);
 }