Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5841)

Unified Diff: chrome/browser/ui/views/toolbar/browser_actions_container.cc

Issue 766263003: [Extension Toolbar] Refactor and finish pop out logic for actions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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),

Powered by Google App Engine
This is Rietveld 408576698