diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-24 04:35:08 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-24 04:35:08 +0000 |
| commit | 92c6f9b9eac950c487f580709e3aab03843d15bc (patch) | |
| tree | 4f25ceede36cf3655de577a48281910752f67262 /chrome/browser/extensions/extension_file_util.cc | |
| parent | 20ee7a74a7587986ed5db9b13aac2a78a5f0bdfc (diff) | |
| download | chromium_src-92c6f9b9eac950c487f580709e3aab03843d15bc.zip chromium_src-92c6f9b9eac950c487f580709e3aab03843d15bc.tar.gz chromium_src-92c6f9b9eac950c487f580709e3aab03843d15bc.tar.bz2 | |
Refactor BrowserActions, and add support for
tab-specific state.
Future changelists will move Page Actions over to
ExtensionAction2, then replace ExtensionAction and
ExtensionActionState with ExtensionAction2.
Also, fix a bug in setIcon({path:...}) where it
would work only the first time.
BUG=24669,24472
Review URL: http://codereview.chromium.org/306044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_file_util.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_file_util.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_file_util.cc b/chrome/browser/extensions/extension_file_util.cc index 23bd085..60d4981 100644 --- a/chrome/browser/extensions/extension_file_util.cc +++ b/chrome/browser/extensions/extension_file_util.cc @@ -242,11 +242,11 @@ bool ValidateExtension(Extension* extension, std::string* error) { } // Validate icon location for browser actions. - const ExtensionAction* browser_action = extension->browser_action(); + ExtensionAction2* browser_action = extension->browser_action(); if (browser_action) { - const std::vector<std::string>& icon_paths = browser_action->icon_paths(); - for (std::vector<std::string>::const_iterator iter = icon_paths.begin(); - iter != icon_paths.end(); ++iter) { + std::vector<std::string>* icon_paths = browser_action->icon_paths(); + for (std::vector<std::string>::iterator iter = icon_paths->begin(); + iter != icon_paths->end(); ++iter) { if (extension->GetResource(*iter).GetFilePath().empty()) { *error = StringPrintf("Could not load icon '%s' for browser action.", iter->c_str()); |