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

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

Issue 2839753005: Remove base::Value::GetAsBinary (Closed)
Patch Set: ASSERT_TRUE Created 3 years, 8 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/extension_action.cc
diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc
index 49b8146c4db3632d64121661e524bfc0ee185e9a..031f9564d3f38d0360abb4774c132085d2dc4db0 100644
--- a/chrome/browser/extensions/extension_action.cc
+++ b/chrome/browser/extensions/extension_action.cc
@@ -126,12 +126,11 @@ bool ExtensionAction::ParseIconFromCanvasDictionary(
gfx::ImageSkia* icon) {
for (base::DictionaryValue::Iterator iter(dict); !iter.IsAtEnd();
iter.Advance()) {
- const base::Value* image_data;
std::string binary_string64;
IPC::Message pickle;
- if (iter.value().GetAsBinary(&image_data)) {
- pickle = IPC::Message(image_data->GetBlob().data(),
- image_data->GetBlob().size());
+ if (iter.value().is_blob()) {
+ pickle = IPC::Message(iter.value().GetBlob().data(),
+ iter.value().GetBlob().size());
} else if (iter.value().GetAsString(&binary_string64)) {
std::string binary_string;
if (!base::Base64Decode(binary_string64, &binary_string))

Powered by Google App Engine
This is Rietveld 408576698