chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.cc - Issue 1105713002: [Extension Toolbar] Slide out overflowed actions for popups

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/toolbar_actions_bar_unittest.cc

Issue 1105713002: [Extension Toolbar] Slide out overflowed actions for popups (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Latest master Created 5 years, 8 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/toolbar_actions_bar.cc ('k') | chrome/browser/ui/views/extensions/extension_action_platform_delegate_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 01b58723ea76d24e9b508b642bec62f7e3f20491..c765dfa6d9de98213e6aaf9746d30e0cba710a7f 100644

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

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

@@ -39,7 +39,7 @@ std::string VerifyToolbarOrderForBar(

size_t total_size,

size_t visible_count) {

const std::vector<ToolbarActionViewController*>& toolbar_actions =

- actions_bar->toolbar_actions();

+ actions_bar->toolbar_actions_unordered();

// If the total size is wrong, we risk segfaulting by continuing. Abort now.

if (total_size != toolbar_actions.size()) {

return base::StringPrintf("Incorrect action count: expected %d, found %d",

@@ -395,8 +395,10 @@ TEST_F(ToolbarActionsBarUnitTest, ToolbarActionsReorderOnPrefChange) {

}

extensions::ExtensionIdList new_order;

- new_order.push_back(toolbar_actions_bar()->toolbar_actions()[1]->GetId());

- new_order.push_back(toolbar_actions_bar()->toolbar_actions()[2]->GetId());

+ new_order.push_back(toolbar_actions_bar()->toolbar_actions_unordered()[1]->

+ GetId());

+ new_order.push_back(toolbar_actions_bar()->toolbar_actions_unordered()[2]->

+ GetId());

extensions::ExtensionPrefs::Get(profile())->SetToolbarOrder(new_order);

{