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

Unified Diff: chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.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
« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_actions_container.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
index 01db64c4ba6928bce96f630639768494104b484d..9478a756e00948ef0e1f4e602eb3c650fb4f34d8 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view_interactive_uitest.cc
@@ -4,6 +4,7 @@
#include "base/run_loop.h"
#include "chrome/browser/extensions/extension_browsertest.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "chrome/browser/ui/views/frame/test_with_browser_view.h"
#include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h"
@@ -126,7 +127,7 @@ void ToolbarViewInteractiveUITest::SetUpCommandLine(
// are constructed.
feature_override_.reset(new extensions::FeatureSwitch::ScopedOverride(
extensions::FeatureSwitch::extension_action_redesign(), true));
- BrowserActionsContainer::disable_animations_during_testing_ = true;
+ ToolbarActionsBar::disable_animations_for_testing_ = true;
WrenchToolbarButton::g_open_wrench_immediately_for_testing = true;
}
@@ -138,7 +139,7 @@ void ToolbarViewInteractiveUITest::SetUpOnMainThread() {
}
void ToolbarViewInteractiveUITest::TearDownOnMainThread() {
- BrowserActionsContainer::disable_animations_during_testing_ = false;
+ ToolbarActionsBar::disable_animations_for_testing_ = false;
WrenchToolbarButton::g_open_wrench_immediately_for_testing = false;
}
« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_actions_container.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698