chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc - Issue 1363943002: Revert of [Extensions Toolbar] Add a finch config for the redesign

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/toolbar/browser_actions_bar_browsertest.cc

Issue 1363943002: Revert of [Extensions Toolbar] Add a finch config for the redesign (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 months 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/toolbar/browser_actions_bar_browsertest.h ('k') | chrome/browser/ui/views/location_bar/page_action_image_view_interactive_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc

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

index f12b10f64af55b65b6796ae33034eda0ef14fd66..a9d2a72055f8af8b35273052030a3292eb16bd58 100644

--- a/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc

+++ b/chrome/browser/ui/toolbar/browser_actions_bar_browsertest.cc

@@ -60,12 +60,8 @@

void BrowserActionsBarBrowserTest::SetUpCommandLine(

base::CommandLine* command_line) {

+ ToolbarActionsBar::disable_animations_for_testing_ = true;

ExtensionBrowserTest::SetUpCommandLine(command_line);

- ToolbarActionsBar::disable_animations_for_testing_ = true;

- // These tests are deliberately testing behavior without the redesign.

- // Forcefully disable it.

- override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(

- extensions::FeatureSwitch::extension_action_redesign(), false));

}

void BrowserActionsBarBrowserTest::SetUpOnMainThread() {

@@ -114,9 +110,9 @@

void BrowserActionsBarRedesignBrowserTest::SetUpCommandLine(

base::CommandLine* command_line) {

BrowserActionsBarBrowserTest::SetUpCommandLine(command_line);

- // Override to force the redesign.

- override_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(

- extensions::FeatureSwitch::extension_action_redesign(), true));

+ enable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(

+ extensions::FeatureSwitch::extension_action_redesign(),

+ true));

}

// Test the basic functionality.