| Index: chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| index 71e57f5b4b9b83fc9149a3bcc048381659d0028b..dfdbdece2325033a5f44b881ab789a937c49153a 100644
|
| --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| @@ -598,11 +598,10 @@ void BrowserActionsContainer::WriteDragDataForView(View* sender,
|
| toolbar_actions_bar_->OnDragStarted();
|
| DCHECK(data);
|
|
|
| - ToolbarActionViews::iterator iter = std::find(toolbar_action_views_.begin(),
|
| - toolbar_action_views_.end(),
|
| - sender);
|
| - DCHECK(iter != toolbar_action_views_.end());
|
| - ToolbarActionViewController* view_controller = (*iter)->view_controller();
|
| + auto it = std::find(toolbar_action_views_.cbegin(),
|
| + toolbar_action_views_.cend(), sender);
|
| + DCHECK(it != toolbar_action_views_.cend());
|
| + ToolbarActionViewController* view_controller = (*it)->view_controller();
|
| gfx::Size size(ToolbarActionsBar::IconWidth(false),
|
| ToolbarActionsBar::IconHeight());
|
| drag_utils::SetDragImageOnDataObject(
|
| @@ -611,7 +610,7 @@ void BrowserActionsContainer::WriteDragDataForView(View* sender,
|
| data);
|
| // Fill in the remaining info.
|
| BrowserActionDragData drag_data(view_controller->GetId(),
|
| - iter - toolbar_action_views_.begin());
|
| + it - toolbar_action_views_.cbegin());
|
| drag_data.Write(browser_->profile(), data);
|
| }
|
|
|
|
|