Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(710)

Unified Diff: chrome/browser/extensions/api/extension_action/extension_actions_api.cc

Issue 10905005: Change browser/page action default icon defined in manifest to support hidpi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/extension_action/extension_actions_api.cc
diff --git a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
index 7b4cd1f1ec81085d8d53513249ccdd3b1fce8854..2569cf28868264dfd2a92b016c5d4a7682ccfb1d 100644
--- a/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_actions_api.cc
@@ -126,7 +126,8 @@ scoped_ptr<base::DictionaryValue> DefaultsToValue(ExtensionAction* action) {
dict->SetInteger(kAppearanceStorageKey,
action->GetIsVisible(kTabId) ?
ExtensionAction::ACTIVE : ExtensionAction::INVISIBLE);
- dict->SetString(kIconStorageKey, ImageToString(action->GetIcon(kTabId)));
+ dict->SetString(kIconStorageKey,
tbarzic 2012/08/29 22:01:29 this is not really intended behaviour (it will sav
+ ImageToString(action->GetIcon(kTabId, NULL)));
return dict.Pass();
}
@@ -418,9 +419,7 @@ bool ExtensionActionSetIconFunction::RunExtensionAction() {
// set. Until we decide what to do with that, ignore.
if (!GetExtension()->page_action())
return true;
- if (icon_index < 0 ||
- static_cast<size_t>(icon_index) >=
- extension_action_->icon_paths()->size()) {
+ if (!extension_action_->IsValidIconIndex(icon_index)) {
error_ = kIconIndexOutOfBounds;
return false;
}
@@ -429,6 +428,7 @@ bool ExtensionActionSetIconFunction::RunExtensionAction() {
} else {
EXTENSION_FUNCTION_VALIDATE(false);
}
+LOG(ERROR) << "NOTIFY CHANGED";
NotifyChange();
return true;
}

Powered by Google App Engine
This is Rietveld 408576698