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

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm

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/cocoa/extensions/browser_action_test_util_mac.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm
index 294a534899aa564b25a9699e22e968b75108ebe5..5650825fd22cd505f7378a3e4ab70b5de4320e9b 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_test_util_mac.mm
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_toolbar_model.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
#import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
#import "chrome/browser/ui/cocoa/extensions/browser_action_button.h"
@@ -118,10 +119,12 @@ bool BrowserActionTestUtil::HidePopup() {
// static
void BrowserActionTestUtil::DisableAnimations() {
+ ToolbarActionsBar::disable_animations_during_testing_ = true;
}
// static
void BrowserActionTestUtil::EnableAnimations() {
+ ToolbarActionsBar::disable_animations_during_testing_ = false;
}
// static

Powered by Google App Engine
This is Rietveld 408576698