| 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 25abcde0d38b877a9b6597d788e2148c9e265425..a3fea54a19e6ca960fe43bb295cbb1549d642428 100644
|
| --- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| +++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
|
| @@ -69,9 +69,11 @@ bool BrowserActionsContainer::disable_animations_during_testing_ = false;
|
| BrowserActionsContainer::BrowserActionsContainer(
|
| Browser* browser,
|
| BrowserActionsContainer* main_container)
|
| - : toolbar_actions_bar_(new ToolbarActionsBar(this,
|
| - browser,
|
| - main_container != nullptr)),
|
| + : toolbar_actions_bar_(new ToolbarActionsBar(
|
| + this,
|
| + browser,
|
| + main_container ?
|
| + main_container->toolbar_actions_bar_.get() : nullptr)),
|
| browser_(browser),
|
| main_container_(main_container),
|
| popup_owner_(NULL),
|
|
|