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

Unified Diff: chrome/browser/ui/views/toolbar/browser_actions_container.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/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..f2e2ac00ac7c8c66324da8467c15a0f98139ada2 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -63,9 +63,6 @@ BrowserActionsContainer::DropPosition::DropPosition(
////////////////////////////////////////////////////////////////////////////////
// BrowserActionsContainer
-// static
-bool BrowserActionsContainer::disable_animations_during_testing_ = false;
-
BrowserActionsContainer::BrowserActionsContainer(
Browser* browser,
BrowserActionsContainer* main_container)
@@ -288,9 +285,7 @@ void BrowserActionsContainer::ResizeAndAnimate(
gfx::Tween::Type tween_type,
int target_width,
bool suppress_chevron) {
- if (resize_animation_ &&
- !disable_animations_during_testing_ &&
- !toolbar_actions_bar_->suppress_animation()) {
+ if (resize_animation_ && !toolbar_actions_bar_->suppress_animation()) {
// Animate! We have to set the animation_target_size_ after calling Reset(),
// because that could end up calling AnimationEnded which clears the value.
resize_animation_->Reset();

Powered by Google App Engine
This is Rietveld 408576698