Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

chrome/browser/extensions/image_loader.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/image_loader.h"
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/extensions/image_loader_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "grit/component_extension_resources_map.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 #include "webkit/glue/image_decoder.h"
 
 using content::BrowserThread;
 using extensions::Extension;
 using extensions::ImageLoader;
+using extensions::Manifest;
 
 namespace {
 
 bool ShouldResizeImageRepresentation(
     ImageLoader::ImageRepresentation::ResizeCondition resize_method,
     const gfx::Size& decoded_size,
     const gfx::Size& desired_size) {
   switch (resize_method) {
     case ImageLoader::ImageRepresentation::ALWAYS_RESIZE:
       return decoded_size != desired_size;
@@ skipping 198 matching lines @@
   std::vector<SkBitmap> bitmaps;
   bitmaps.resize(info_list.size());
 
   int i = 0;
   for (std::vector<ImageRepresentation>::const_iterator it = info_list.begin();
        it != info_list.end(); ++it, ++i) {
     DCHECK(it->resource.relative_path().empty() ||
            extension->path() == it->resource.extension_root());
 
     int resource_id;
-    if (extension->location() == Extension::COMPONENT &&
+    if (extension->location() == Manifest::COMPONENT &&
         IsComponentExtensionResource(extension->path(),
                                      it->resource.relative_path(),
                                      &resource_id)) {
       LoadResourceOnUIThread(resource_id, &bitmaps[i]);
     }
   }
 
   DCHECK(!BrowserThread::GetBlockingPool()->RunsTasksOnCurrentThread());
   std::vector<LoadResult>* load_result = new std::vector<LoadResult>;
   BrowserThread::PostBlockingPoolTaskAndReply(
@@ skipping 54 matching lines @@
   gfx::Image image;
   if (!image_skia.isNull()) {
     image_skia.MakeThreadSafe();
     image = gfx::Image(image_skia);
   }
 
   callback.Run(image);
 }
 
 }  // namespace extensions