Generalize ExtensionIconSet to store icon paths for custom size sets

chrome/browser/ui/webui/extensions/extension_activity_ui.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/webui/extensions/extension_activity_ui.h"
 
 #include "base/bind.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/browser/ui/webui/shared_resources_data_source.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 ExtensionActivityUI::ExtensionActivityUI(content::WebUI* web_ui)
     : WebUIController(web_ui), extension_(NULL) {
   web_ui->HideURL();
   web_ui->OverrideTitle(l10n_util::GetStringUTF16(
@@ skipping 39 matching lines @@
     return;
 
   ExtensionService* extension_service = Profile::FromWebUI(web_ui())->
       GetExtensionService();
   extension_ = extension_service->GetExtensionById(extension_id, false);
   if (!extension_)
     return;
 
   GURL icon =
       ExtensionIconSource::GetIconURL(extension_,
-                                      ExtensionIconSet::EXTENSION_ICON_MEDIUM,
+                                      extension_misc::EXTENSION_ICON_MEDIUM,
                                       ExtensionIconSet::MATCH_BIGGER,
                                       false, NULL);
 
   DictionaryValue* extension_data = new DictionaryValue();  // Owned by result.
   extension_data->SetString("id", extension_->id());
   extension_data->SetString("name", extension_->name());
   extension_data->SetString("version", extension_->version()->GetString());
   extension_data->SetString("description", extension_->description());
   extension_data->SetString("icon", icon.spec());
 
   DictionaryValue result;
   result.Set("extension", extension_data);
 
   web_ui()->CallJavascriptFunction("extension_activity.handleExtensionData",
                                    result);
 
   ExtensionActivityLog::GetInstance()->AddObserver(extension_, this);
 }
 
 void ExtensionActivityUI::OnExtensionActivity(
       const extensions::Extension* extension,
       ExtensionActivityLog::Activity activity,
       const std::string& msg) {
   DictionaryValue result;
   result.SetInteger("activity", activity);
   result.SetString("message", msg);
   web_ui()->CallJavascriptFunction("extension_activity.handleExtensionActivity",
                                    result);
 }