Index: chrome/browser/extensions/extension_browser_actions_api.cc |
diff --git a/chrome/browser/extensions/extension_browser_actions_api.cc b/chrome/browser/extensions/extension_browser_actions_api.cc |
index 0a37658901cf686c8ac45d251e5843be7e8aca0c..df58bfd8c33f1e6f373f782c79da93a8872142cd 100644 |
--- a/chrome/browser/extensions/extension_browser_actions_api.cc |
+++ b/chrome/browser/extensions/extension_browser_actions_api.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -49,7 +49,7 @@ bool BrowserActionSetIconFunction::RunBrowserAction() { |
base::BinaryValue* binary = NULL; |
EXTENSION_FUNCTION_VALIDATE(details_->GetBinary("imageData", &binary)); |
IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize()); |
- void* iter = NULL; |
+ PickleIterator iter(bitmap_pickle); |
SkBitmap bitmap; |
EXTENSION_FUNCTION_VALIDATE( |
IPC::ReadParam(&bitmap_pickle, &iter, &bitmap)); |