Move Icons out of Extension class

chrome/browser/chromeos/extensions/file_browser_private_api.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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/chromeos/extensions/file_browser_private_api.h"
 
 #include <sys/stat.h>
 #include <sys/statvfs.h>
 #include <sys/types.h>
 #include <utime.h>
 #include <utility>
@@ skipping 37 matching lines @@
 #include "chrome/browser/google_apis/drive_service_interface.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
 #include "chrome/browser/google_apis/operation_registry.h"
 #include "chrome/browser/google_apis/time_util.h"
 #include "chrome/browser/intents/web_intents_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
+#include "chrome/common/extensions/api/icons/icons_handler.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/extensions/extension_manifest_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
@@ skipping 854 matching lines @@
 
     for (FileHandlerList::iterator i = file_handlers.begin();
          i != file_handlers.end(); ++i) {
       DictionaryValue* task = new DictionaryValue;
       std::string task_id = file_handler_util::MakeTaskID(extension->id(),
           file_handler_util::kTaskApp, (*i)->id);
       task->SetString("taskId", task_id);
       task->SetString("title", (*i)->title);
       task->SetBoolean("isDefault", false);
 
-      GURL best_icon = extension->GetIconURL(kPreferredIconSize,
-                                             ExtensionIconSet::MATCH_BIGGER);
+      GURL best_icon = extensions::IconsInfo::GetIconURL(
+          extension, kPreferredIconSize,ExtensionIconSet::MATCH_BIGGER);
       if (!best_icon.is_empty())
         task->SetString("iconUrl", best_icon.spec());
       else
         task->SetString("iconUrl", kDefaultIcon);
 
       task->SetBoolean("driveApp", false);
       result_list->Append(task);
     }
   }
 
@@ skipping 31 matching lines @@
             extension, web_intents::kActionView, mime_types, &title))
       continue;
 
     DictionaryValue* task = new DictionaryValue;
     std::string task_id = file_handler_util::MakeTaskID(extension->id(),
         file_handler_util::kTaskWebIntent, web_intents::kActionView);
     task->SetString("taskId", task_id);
     task->SetString("title", title);
     task->SetBoolean("isDefault", false);
 
-    GURL best_icon = extension->GetIconURL(kPreferredIconSize,
-                                           ExtensionIconSet::MATCH_BIGGER);
+    GURL best_icon = extensions::IconsInfo::GetIconURL(
+        extension, kPreferredIconSize,ExtensionIconSet::MATCH_BIGGER);
     if (!best_icon.is_empty())
       task->SetString("iconUrl", best_icon.spec());
     else
       task->SetString("iconUrl", kDefaultIcon);
 
     task->SetBoolean("driveApp", false);
     result_list->Append(task);
   }
 
   return true;
@@ skipping 2015 matching lines @@
   // Keep the refcount until the zipping is complete on utility process.
   AddRef();
   return true;
 }
 
 void ZipSelectionFunction::OnZipDone(bool success) {
   SetResult(new base::FundamentalValue(success));
   SendResponse(true);
   Release();
 }