| Index: chrome/browser/ui/views/extensions/browser_action_drag_data.cc
|
| diff --git a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc b/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
|
| index 0a5413f15eaa282ca813fd74d2d237e031ec0dd5..5af522230ce5eeaad6a22b67a3745a9b4bdaa4a1 100644
|
| --- a/chrome/browser/ui/views/extensions/browser_action_drag_data.cc
|
| +++ b/chrome/browser/ui/views/extensions/browser_action_drag_data.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.
|
|
|
| @@ -71,7 +71,7 @@ void BrowserActionDragData::WriteToPickle(
|
| }
|
|
|
| bool BrowserActionDragData::ReadFromPickle(Pickle* pickle) {
|
| - void* data_iterator = NULL;
|
| + PickleIterator data_iterator(*pickle);
|
|
|
| const char* tmp;
|
| if (!pickle->ReadBytes(&data_iterator, &tmp, sizeof(profile_)))
|
|
|