chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc - Issue 795663003: [Mac Extensions Toolbar] Make the container's animationEndFrame always valid

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/toolbar/browser_action_test_util_views.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

« chrome/browser/ui/toolbar/toolbar_actions_bar.h ('K') | « chrome/browser/ui/toolbar/toolbar_actions_bar.cc ('k') | chrome/browser/ui/views/toolbar/browser_actions_container.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc

diff --git a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc

index 8a03938f0b751f18d6a8a64a6f0947402cefc8aa..ba83142b71b1d37ceff1925a4039a859d0b933b9 100644

--- a/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc

+++ b/chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc

@@ -11,6 +11,7 @@

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/browser_window_testing_views.h"

#include "chrome/browser/ui/extensions/extension_action_view_controller.h"

+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"

#include "chrome/browser/ui/views/extensions/extension_popup.h"

#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"

#include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"

@@ -113,12 +114,12 @@ void BrowserActionTestUtil::SetIconVisibilityCount(size_t icons) {

// static

void BrowserActionTestUtil::DisableAnimations() {

- BrowserActionsContainer::disable_animations_during_testing_ = true;

+ ToolbarActionsBar::disable_animations_during_testing_ = true;

}

// static

void BrowserActionTestUtil::EnableAnimations() {

- BrowserActionsContainer::disable_animations_during_testing_ = false;

+ ToolbarActionsBar::disable_animations_during_testing_ = false;

}

// static