| Index: chrome/browser/ui/toolbar/toolbar_actions_model.cc
|
| diff --git a/chrome/browser/ui/toolbar/toolbar_actions_model.cc b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
|
| index 2145668a49d95ea615a9e14de921312cfeccb039..d10e0c87860d111919c52633e7a7973e84552503 100644
|
| --- a/chrome/browser/ui/toolbar/toolbar_actions_model.cc
|
| +++ b/chrome/browser/ui/toolbar/toolbar_actions_model.cc
|
| @@ -164,7 +164,7 @@ ScopedVector<ToolbarActionViewController> ToolbarActionsModel::CreateActions(
|
| for (const ToolbarItem& item : toolbar_items())
|
| action_list.push_back(CreateActionForItem(browser, bar, item).release());
|
|
|
| - return action_list.Pass();
|
| + return action_list;
|
| }
|
|
|
| scoped_ptr<ToolbarActionViewController>
|
| @@ -187,15 +187,14 @@ ToolbarActionsModel::CreateActionForItem(Browser* browser,
|
| case COMPONENT_ACTION: {
|
| DCHECK(use_redesign_);
|
| result = ComponentToolbarActionsFactory::GetInstance()
|
| - ->GetComponentToolbarActionForId(item.id, browser, bar)
|
| - .Pass();
|
| + ->GetComponentToolbarActionForId(item.id, browser, bar);
|
| break;
|
| }
|
| case UNKNOWN_ACTION:
|
| NOTREACHED(); // Should never have an UNKNOWN_ACTION in toolbar_items.
|
| break;
|
| }
|
| - return result.Pass();
|
| + return result;
|
| }
|
|
|
| void ToolbarActionsModel::OnExtensionActionVisibilityChanged(
|
|
|