summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_file_util.cc
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 06:17:57 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 06:17:57 +0000
commit5d246db2292523a348d975ca9d65e786389df14f (patch)
tree9d4b515b7bc8516872fc7fb6fdbe9e715843475a /chrome/browser/extensions/extension_file_util.cc
parent7dc7f0329728dd9d0e11655652a6ec231cb1065d (diff)
downloadchromium_src-5d246db2292523a348d975ca9d65e786389df14f.zip
chromium_src-5d246db2292523a348d975ca9d65e786389df14f.tar.gz
chromium_src-5d246db2292523a348d975ca9d65e786389df14f.tar.bz2
Replace ExtensionAction with ExtensionAction2.
BUG=24472 Review URL: http://codereview.chromium.org/337035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_file_util.cc')
-rw-r--r--chrome/browser/extensions/extension_file_util.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc
index a71f2a2..5fe5005 100644
--- a/chrome/browser/extensions/extension_file_util.cc
+++ b/chrome/browser/extensions/extension_file_util.cc
@@ -228,7 +228,7 @@ bool ValidateExtension(Extension* extension, std::string* error) {
}
// Validate icon location for page actions.
- ExtensionAction2* page_action = extension->page_action();
+ ExtensionAction* page_action = extension->page_action();
if (page_action) {
std::vector<std::string> icon_paths(*page_action->icon_paths());
if (!page_action->default_icon_path().empty())
@@ -245,7 +245,7 @@ bool ValidateExtension(Extension* extension, std::string* error) {
// Validate icon location for browser actions.
// Note: browser actions don't use the icon_paths().
- ExtensionAction2* browser_action = extension->browser_action();
+ ExtensionAction* browser_action = extension->browser_action();
if (browser_action) {
std::string default_icon_path = browser_action->default_icon_path();
if (!default_icon_path.empty()) {