| Index: chrome/common/extensions/api/extension_action/browser_action_handler.cc
|
| diff --git a/chrome/common/extensions/api/extension_action/browser_action_handler.cc b/chrome/common/extensions/api/extension_action/browser_action_handler.cc
|
| index fdbf489418f5a2038291bf27dd607a582b725a44..35bc0a61bcf4335849c1c5fcaed4a4430faf0529 100644
|
| --- a/chrome/common/extensions/api/extension_action/browser_action_handler.cc
|
| +++ b/chrome/common/extensions/api/extension_action/browser_action_handler.cc
|
| @@ -7,9 +7,9 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| -#include "chrome/common/extensions/extension_file_util.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/feature_switch.h"
|
| +#include "extensions/common/file_util.h"
|
| #include "extensions/common/manifest.h"
|
| #include "extensions/common/manifest_constants.h"
|
| #include "grit/generated_resources.h"
|
| @@ -46,7 +46,7 @@ bool BrowserActionHandler::Validate(
|
| std::vector<InstallWarning>* warnings) const {
|
| const ActionInfo* action = ActionInfo::GetBrowserActionInfo(extension);
|
| if (action && !action->default_icon.empty() &&
|
| - !extension_file_util::ValidateExtensionIconSet(
|
| + !file_util::ValidateExtensionIconSet(
|
| action->default_icon,
|
| extension,
|
| IDS_EXTENSION_LOAD_ICON_FOR_BROWSER_ACTION_FAILED,
|
|
|