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

Unified Diff: chrome/browser/ui/toolbar/toolbar_actions_bar.cc

Issue 795663003: [Mac Extensions Toolbar] Make the container's animationEndFrame always valid (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/toolbar/toolbar_actions_bar.cc
diff --git a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
index 7bf048a702d6ba30f66a2cc2e12d0d411dd11d81..c0b7a623f2985e50be040a0aa1ff7970fdf3b247 100644
--- a/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
+++ b/chrome/browser/ui/toolbar/toolbar_actions_bar.cc
@@ -61,6 +61,9 @@ int GetIconDimension(DimensionType type) {
} // namespace
+// static
+bool ToolbarActionsBar::disable_animations_during_testing_ = false;
+
ToolbarActionsBar::PlatformSettings::PlatformSettings(bool in_overflow_mode)
: left_padding(in_overflow_mode ? kOverflowLeftPadding : kLeftPadding),
right_padding(in_overflow_mode ? kOverflowRightPadding : kRightPadding),
@@ -249,6 +252,7 @@ void ToolbarActionsBar::CreateActions() {
if (!toolbar_actions_.empty())
ReorderActions();
+
for (size_t i = 0; i < toolbar_actions_.size(); ++i)
delegate_->AddViewForAction(toolbar_actions_[i], i);
}
@@ -525,6 +529,7 @@ void ToolbarActionsBar::OnToolbarModelInitialized() {
// We shouldn't have any actions before the model is initialized.
DCHECK(toolbar_actions_.empty());
CreateActions();
+ ResizeDelegate(gfx::Tween::EASE_OUT, false);
}
Browser* ToolbarActionsBar::GetBrowser() {

Powered by Google App Engine
This is Rietveld 408576698