Index: extensions/common/manifest_handlers/icons_handler.cc |
diff --git a/chrome/common/extensions/manifest_handlers/icons_handler.cc b/extensions/common/manifest_handlers/icons_handler.cc |
similarity index 89% |
rename from chrome/common/extensions/manifest_handlers/icons_handler.cc |
rename to extensions/common/manifest_handlers/icons_handler.cc |
index ee38952a4dbc319072c20774f61128ed88fbf11e..0c9b9d7d87a091f854094bbde21f7f88b1cca4fc 100644 |
--- a/chrome/common/extensions/manifest_handlers/icons_handler.cc |
+++ b/extensions/common/manifest_handlers/icons_handler.cc |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "chrome/common/extensions/manifest_handlers/icons_handler.h" |
+#include "extensions/common/manifest_handlers/icons_handler.h" |
#include "base/file_util.h" |
#include "base/lazy_instance.h" |
@@ -10,14 +10,13 @@ |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/values.h" |
-#include "chrome/common/extensions/extension_file_util.h" |
#include "extensions/common/constants.h" |
#include "extensions/common/extension.h" |
+#include "extensions/common/file_util.h" |
#include "extensions/common/manifest_constants.h" |
#include "extensions/common/manifest_handler_helpers.h" |
#include "grit/generated_resources.h" |
#include "grit/theme_resources.h" |
-#include "third_party/skia/include/core/SkBitmap.h" |
#include "ui/base/resource/resource_bundle.h" |
#include "ui/gfx/size.h" |
@@ -97,11 +96,10 @@ bool IconsHandler::Parse(Extension* extension, base::string16* error) { |
bool IconsHandler::Validate(const Extension* extension, |
std::string* error, |
std::vector<InstallWarning>* warnings) const { |
- return extension_file_util::ValidateExtensionIconSet( |
- IconsInfo::GetIcons(extension), |
- extension, |
- IDS_EXTENSION_LOAD_ICON_FAILED, |
- error); |
+ return file_util::ValidateExtensionIconSet(IconsInfo::GetIcons(extension), |
+ extension, |
+ IDS_EXTENSION_LOAD_ICON_FAILED, |
+ error); |
} |
const std::vector<std::string> IconsHandler::Keys() const { |