diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 06:07:38 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-15 06:07:38 +0000 |
| commit | 15294d803ac17bb5355076c90ddbecca983985a8 (patch) | |
| tree | 4d8a0f1a95daf85c51420bfa41984becad28e12c /chrome/browser/extensions/extension_browser_actions_api.cc | |
| parent | 66ff7356a381d6c8c6c3272b095938408c4f3188 (diff) | |
| download | chromium_src-15294d803ac17bb5355076c90ddbecca983985a8.zip chromium_src-15294d803ac17bb5355076c90ddbecca983985a8.tar.gz chromium_src-15294d803ac17bb5355076c90ddbecca983985a8.tar.bz2 | |
Remove the implicit wrench menu items for browser actions.
Also, allow browser actions with no initial icons, and add
some better tests.
BUG=24379,24671
Review URL: http://codereview.chromium.org/276010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29095 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_browser_actions_api.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_browser_actions_api.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/browser/extensions/extension_browser_actions_api.cc b/chrome/browser/extensions/extension_browser_actions_api.cc index d2cb604..e7d875e 100644 --- a/chrome/browser/extensions/extension_browser_actions_api.cc +++ b/chrome/browser/extensions/extension_browser_actions_api.cc @@ -42,6 +42,7 @@ bool BrowserActionSetIconFunction::RunImpl() { EXTENSION_FUNCTION_VALIDATE( static_cast<DictionaryValue*>(args_)->GetInteger( L"iconIndex", &icon_index)); + if (icon_index < 0 || static_cast<size_t>(icon_index) >= extension->browser_action()->icon_paths().size()) { |