1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
|
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/browser/ui/toolbar/toolbar_actions_bar_unittest.h"
#include "base/command_line.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_action_manager.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "chrome/browser/ui/extensions/extension_toolbar_icon_surfacing_bubble_delegate.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
#include "chrome/browser/ui/toolbar/toolbar_actions_bar_delegate.h"
#include "chrome/common/pref_names.h"
#include "extensions/browser/extension_prefs.h"
#include "extensions/browser/extension_system.h"
#include "extensions/common/extension.h"
namespace {
// Verifies that the toolbar order matches for the given |actions_bar|. If the
// order matches, the return value is empty; otherwise, it contains the error.
std::string VerifyToolbarOrderForBar(
const ToolbarActionsBar* actions_bar,
BrowserActionTestUtil* browser_action_test_util,
const char* expected_names[],
size_t total_size,
size_t visible_count) {
const std::vector<ToolbarActionViewController*>& 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",
static_cast<int>(total_size),
static_cast<int>(toolbar_actions.size()));
}
// Check that the ToolbarActionsBar matches the expected state.
std::string error;
for (size_t i = 0; i < total_size; ++i) {
if (std::string(expected_names[i]) !=
base::UTF16ToUTF8(toolbar_actions[i]->GetActionName())) {
error += base::StringPrintf(
"Incorrect action in bar at index %d: expected '%s', found '%s'.\n",
static_cast<int>(i),
expected_names[i],
base::UTF16ToUTF8(toolbar_actions[i]->GetActionName()).c_str());
}
}
size_t icon_count = actions_bar->GetIconCount();
if (visible_count != icon_count)
error += base::StringPrintf(
"Incorrect visible count: expected %d, found %d.\n",
static_cast<int>(visible_count), static_cast<int>(icon_count));
// Test that the (platform-specific) toolbar view matches the expected state.
for (size_t i = 0; i < total_size; ++i) {
std::string id = browser_action_test_util->GetExtensionId(i);
if (id != toolbar_actions[i]->GetId()) {
error += base::StringPrintf(
"Incorrect action in view at index %d: expected '%s', found '%s'.\n",
static_cast<int>(i),
toolbar_actions[i]->GetId().c_str(),
id.c_str());
}
}
size_t view_icon_count = browser_action_test_util->VisibleBrowserActions();
if (visible_count != view_icon_count)
error += base::StringPrintf(
"Incorrect visible count in view: expected %d, found %d.\n",
static_cast<int>(visible_count), static_cast<int>(view_icon_count));
return error;
}
} // namespace
ToolbarActionsBarUnitTest::ToolbarActionsBarUnitTest()
: toolbar_model_(nullptr),
use_redesign_(false) {}
ToolbarActionsBarUnitTest::ToolbarActionsBarUnitTest(bool use_redesign)
: toolbar_model_(nullptr),
use_redesign_(use_redesign) {}
ToolbarActionsBarUnitTest::~ToolbarActionsBarUnitTest() {}
void ToolbarActionsBarUnitTest::SetUp() {
if (use_redesign_) {
redesign_switch_.reset(new extensions::FeatureSwitch::ScopedOverride(
extensions::FeatureSwitch::extension_action_redesign(), true));
}
BrowserWithTestWindowTest::SetUp();
// The toolbar typically displays extension icons, so create some extension
// test infrastructure.
extensions::TestExtensionSystem* extension_system =
static_cast<extensions::TestExtensionSystem*>(
extensions::ExtensionSystem::Get(profile()));
extension_system->CreateExtensionService(
base::CommandLine::ForCurrentProcess(),
base::FilePath(),
false);
toolbar_model_ =
extensions::extension_action_test_util::CreateToolbarModelForProfile(
profile());
ToolbarActionsBar::disable_animations_for_testing_ = true;
ToolbarActionsBar::set_send_overflowed_action_changes_for_testing(false);
browser_action_test_util_.reset(new BrowserActionTestUtil(browser(), false));
if (use_redesign_) {
overflow_browser_action_test_util_ =
browser_action_test_util_->CreateOverflowBar();
}
}
void ToolbarActionsBarUnitTest::TearDown() {
// Since the profile gets destroyed in BrowserWithTestWindowTest::TearDown(),
// we need to delete this now.
browser_action_test_util_.reset();
overflow_browser_action_test_util_.reset();
ToolbarActionsBar::disable_animations_for_testing_ = false;
redesign_switch_.reset();
BrowserWithTestWindowTest::TearDown();
}
void ToolbarActionsBarUnitTest::ActivateTab(int index) {
ASSERT_NE(nullptr, browser()->tab_strip_model()->GetWebContentsAt(index));
browser()->tab_strip_model()->ActivateTabAt(index, true);
}
scoped_refptr<const extensions::Extension>
ToolbarActionsBarUnitTest::CreateAndAddExtension(
const std::string& name,
extensions::extension_action_test_util::ActionType action_type) {
scoped_refptr<const extensions::Extension> extension =
extensions::extension_action_test_util::CreateActionExtension(
name, action_type);
extensions::ExtensionSystem::Get(profile())->extension_service()->
AddExtension(extension.get());
return extension;
}
void ToolbarActionsBarUnitTest::SetActionWantsToRunOnTab(
ExtensionAction* action,
content::WebContents* web_contents,
bool wants_to_run) {
action->SetIsVisible(SessionTabHelper::IdForTab(web_contents), wants_to_run);
extensions::ExtensionActionAPI::Get(profile())->NotifyChange(
action, web_contents, profile());
}
testing::AssertionResult ToolbarActionsBarUnitTest::VerifyToolbarOrder(
const char* expected_names[],
size_t total_size,
size_t visible_count) {
std::string main_bar_error =
VerifyToolbarOrderForBar(toolbar_actions_bar(),
browser_action_test_util(),
expected_names,
total_size,
visible_count);
std::string overflow_bar_error;
if (use_redesign_) {
overflow_bar_error =
VerifyToolbarOrderForBar(overflow_bar(),
overflow_browser_action_test_util(),
expected_names,
total_size,
total_size - visible_count);
}
return main_bar_error.empty() && overflow_bar_error.empty() ?
testing::AssertionSuccess() :
testing::AssertionFailure() << "main bar error:\n" << main_bar_error <<
"overflow bar error:\n" << overflow_bar_error;
}
ToolbarActionsBarRedesignUnitTest::ToolbarActionsBarRedesignUnitTest()
: ToolbarActionsBarUnitTest(true) {}
ToolbarActionsBarRedesignUnitTest::~ToolbarActionsBarRedesignUnitTest() {}
TEST_F(ToolbarActionsBarUnitTest, BasicToolbarActionsBarTest) {
// Add three extensions to the profile; this is the easiest way to have
// toolbar actions.
for (int i = 0; i < 3; ++i) {
CreateAndAddExtension(
base::StringPrintf("extension %d", i),
extensions::extension_action_test_util::BROWSER_ACTION);
}
const ToolbarActionsBar::PlatformSettings& platform_settings =
toolbar_actions_bar()->platform_settings();
// By default, all three actions should be visible.
EXPECT_EQ(3u, toolbar_actions_bar()->GetIconCount());
// Check the widths.
int expected_width = 3 * ToolbarActionsBar::IconWidth(true) -
platform_settings.item_spacing +
platform_settings.left_padding +
platform_settings.right_padding;
EXPECT_EQ(expected_width, toolbar_actions_bar()->GetPreferredSize().width());
// Since all icons are showing, the current width should be the max width.
int maximum_width = expected_width;
EXPECT_EQ(maximum_width, toolbar_actions_bar()->GetMaximumWidth());
// The minimum width should be just enough for the chevron to be displayed.
int minimum_width = platform_settings.left_padding +
platform_settings.right_padding +
toolbar_actions_bar()->delegate_for_test()->
GetChevronWidth();
EXPECT_EQ(minimum_width, toolbar_actions_bar()->GetMinimumWidth());
// Test the connection between the ToolbarActionsBar and the model by
// adjusting the visible count.
toolbar_model()->SetVisibleIconCount(2u);
EXPECT_EQ(2u, toolbar_actions_bar()->GetIconCount());
// The current width should now be enough for two icons, and the chevron.
expected_width = 2 * ToolbarActionsBar::IconWidth(true) -
platform_settings.item_spacing +
platform_settings.left_padding +
platform_settings.right_padding +
toolbar_actions_bar()->delegate_for_test()->
GetChevronWidth();
EXPECT_EQ(expected_width, toolbar_actions_bar()->GetPreferredSize().width());
// The maximum and minimum widths should have remained constant (since we have
// the same number of actions).
EXPECT_EQ(maximum_width, toolbar_actions_bar()->GetMaximumWidth());
EXPECT_EQ(minimum_width, toolbar_actions_bar()->GetMinimumWidth());
// Test drag-and-drop logic.
const char kExtension0[] = "extension 0";
const char kExtension1[] = "extension 1";
const char kExtension2[] = "extension 2";
{
// The order should start as 0, 1, 2.
const char* expected_names[] = { kExtension0, kExtension1, kExtension2 };
EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 2u));
}
{
// Drag 0 to be in the second spot; 1, 0, 2, within the same container.
toolbar_actions_bar()->OnDragDrop(0, 1, ToolbarActionsBar::DRAG_TO_SAME);
const char* expected_names[] = { kExtension1, kExtension0, kExtension2 };
EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 2u));
}
{
// Drag 0 to be in the third spot, in the overflow container.
// Order should be 1, 2, 0, and the icon count should reduce by 1.
toolbar_actions_bar()->OnDragDrop(
1, 2, ToolbarActionsBar::DRAG_TO_OVERFLOW);
const char* expected_names[] = { kExtension1, kExtension2, kExtension0 };
EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 1u));
// The model should also reflect the updated icon count.
EXPECT_EQ(1u, toolbar_model()->visible_icon_count());
// Dragging 2 to the main container should work, even if its spot in the
// "list" remains constant.
// Order remains 1, 2, 0, but now we have 2 icons visible.
toolbar_actions_bar()->OnDragDrop(1, 1, ToolbarActionsBar::DRAG_TO_MAIN);
EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 2u));
// Similarly, dragging 2 to overflow, with the same "list" spot, should also
// work. Order remains 1, 2, 0, but icon count goes back to 1.
toolbar_actions_bar()->OnDragDrop(
1, 1, ToolbarActionsBar::DRAG_TO_OVERFLOW);
EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 1u));
}
// Try resizing the toolbar. Start with the current width (enough for 1 icon).
int width = toolbar_actions_bar()->GetPreferredSize().width();
// If we try to resize by increasing, without allowing enough room for a new
// icon, width, and icon count should stay the same.
toolbar_actions_bar()->OnResizeComplete(width + 1);
EXPECT_EQ(width, toolbar_actions_bar()->GetPreferredSize().width());
EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
// If we resize by enough to include a new icon, width and icon count should
// both increase.
width += ToolbarActionsBar::IconWidth(true);
toolbar_actions_bar()->OnResizeComplete(width);
EXPECT_EQ(width, toolbar_actions_bar()->GetPreferredSize().width());
EXPECT_EQ(2u, toolbar_actions_bar()->GetIconCount());
// If we shrink the bar so that a full icon can't fit, it should resize to
// hide that icon.
toolbar_actions_bar()->OnResizeComplete(width - 1);
width -= ToolbarActionsBar::IconWidth(true);
EXPECT_EQ(width, toolbar_actions_bar()->GetPreferredSize().width());
EXPECT_EQ(1u, toolbar_actions_bar()->GetIconCount());
}
TEST_F(ToolbarActionsBarUnitTest, ToolbarActionsReorderOnPrefChange) {
for (int i = 0; i < 3; ++i) {
CreateAndAddExtension(
base::StringPrintf("extension %d", i),
extensions::extension_action_test_util::BROWSER_ACTION);
}
EXPECT_EQ(3u, toolbar_actions_bar()->GetIconCount());
// Change the value of the toolbar preference.
// Test drag-and-drop logic.
const char kExtension0[] = "extension 0";
const char kExtension1[] = "extension 1";
const char kExtension2[] = "extension 2";
{
// The order should start as 0, 1, 2.
const char* expected_names[] = { kExtension0, kExtension1, kExtension2 };
EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 3u));
}
std::vector<std::string> new_order;
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);
{
// The order should now reflect the prefs, and be 1, 2, 0.
const char* expected_names[] = { kExtension1, kExtension2, kExtension0 };
EXPECT_TRUE(VerifyToolbarOrder(expected_names, 3u, 3u));
}
}
TEST_F(ToolbarActionsBarRedesignUnitTest, IconSurfacingBubbleAppearance) {
// Without showing anything new, we shouldn't show the bubble, and should
// auto-acknowledge it.
EXPECT_FALSE(
ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
profile()));
PrefService* prefs = profile()->GetPrefs();
EXPECT_TRUE(
prefs->GetBoolean(prefs::kToolbarIconSurfacingBubbleAcknowledged));
// Clear the pref for testing, and add an extension that wouldn't normally
// have an icon. We should now show the bubble.
prefs->ClearPref(prefs::kToolbarIconSurfacingBubbleAcknowledged);
CreateAndAddExtension("extension",
extensions::extension_action_test_util::NO_ACTION);
EXPECT_TRUE(ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
profile()));
// If the bubble was recently shown, we shouldn't show it again...
scoped_ptr<ToolbarActionsBarBubbleDelegate> bubble_delegate(
new ExtensionToolbarIconSurfacingBubbleDelegate(profile()));
bubble_delegate->OnBubbleShown();
bubble_delegate->OnBubbleClosed(
ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS);
EXPECT_FALSE(
ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
profile()));
// ...But if it was only dismissed, we should show it before too long.
base::Time two_days_ago = base::Time::Now() - base::TimeDelta::FromDays(2);
prefs->SetInt64(prefs::kToolbarIconSurfacingBubbleLastShowTime,
two_days_ago.ToInternalValue());
EXPECT_TRUE(ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
profile()));
// If it's acknowledged, then it should never show again, and should be
// recorded as acknowledged.
bubble_delegate->OnBubbleShown();
bubble_delegate->OnBubbleClosed(
ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE);
EXPECT_FALSE(
ExtensionToolbarIconSurfacingBubbleDelegate::ShouldShowForProfile(
profile()));
base::Time one_week_ago = base::Time::Now() - base::TimeDelta::FromDays(7);
prefs->SetInt64(prefs::kToolbarIconSurfacingBubbleLastShowTime,
one_week_ago.ToInternalValue());
EXPECT_TRUE(
prefs->GetBoolean(prefs::kToolbarIconSurfacingBubbleAcknowledged));
}
// Test the bounds calculation for different indices.
TEST_F(ToolbarActionsBarRedesignUnitTest, TestActionFrameBounds) {
const int kIconWidth = ToolbarActionsBar::IconWidth(false);
const int kIconHeight = ToolbarActionsBar::IconHeight();
const int kIconWidthWithPadding = ToolbarActionsBar::IconWidth(true);
const int kIconsPerOverflowRow = 3;
const int kNumExtensions = 7;
const int kSpacing =
toolbar_actions_bar()->platform_settings().item_spacing;
// Initialization: 7 total extensions, with 3 visible per row in overflow.
// Start with all visible on the main bar.
for (int i = 0; i < kNumExtensions; ++i) {
CreateAndAddExtension(
base::StringPrintf("extension %d", i),
extensions::extension_action_test_util::BROWSER_ACTION);
}
toolbar_model()->SetVisibleIconCount(kNumExtensions);
overflow_bar()->SetOverflowRowWidth(
kIconWidthWithPadding * kIconsPerOverflowRow + 3);
EXPECT_EQ(kIconsPerOverflowRow,
overflow_bar()->platform_settings().icons_per_overflow_menu_row);
// Check main bar calculations. Actions should be laid out in a line, so
// all on the same (0) y-axis.
EXPECT_EQ(gfx::Rect(kSpacing, 0, kIconWidth, kIconHeight),
toolbar_actions_bar()->GetFrameForIndex(0));
EXPECT_EQ(gfx::Rect(kSpacing + kIconWidthWithPadding, 0, kIconWidth,
kIconHeight),
toolbar_actions_bar()->GetFrameForIndex(1));
EXPECT_EQ(gfx::Rect(kSpacing + kIconWidthWithPadding * (kNumExtensions - 1),
0, kIconWidth, kIconHeight),
toolbar_actions_bar()->GetFrameForIndex(kNumExtensions - 1));
// Check overflow bar calculations.
toolbar_model()->SetVisibleIconCount(3);
// Any actions that are shown on the main bar should have an empty rect for
// the frame.
EXPECT_EQ(gfx::Rect(), overflow_bar()->GetFrameForIndex(0));
EXPECT_EQ(gfx::Rect(), overflow_bar()->GetFrameForIndex(2));
// Other actions should start from their relative index; that is, the first
// action shown should be in the first spot's bounds, even though it's the
// third action by index.
EXPECT_EQ(gfx::Rect(kSpacing, 0, kIconWidth, kIconHeight),
overflow_bar()->GetFrameForIndex(3));
EXPECT_EQ(gfx::Rect(kSpacing + kIconWidthWithPadding, 0, kIconWidth,
kIconHeight),
overflow_bar()->GetFrameForIndex(4));
EXPECT_EQ(gfx::Rect(kSpacing + kIconWidthWithPadding * 2, 0, kIconWidth,
kIconHeight),
overflow_bar()->GetFrameForIndex(5));
// And the actions should wrap, so that it starts back at the left on a new
// row.
EXPECT_EQ(gfx::Rect(kSpacing, kIconHeight, kIconWidth, kIconHeight),
overflow_bar()->GetFrameForIndex(6));
// Check with > 2 rows.
toolbar_model()->SetVisibleIconCount(0);
EXPECT_EQ(gfx::Rect(kSpacing, 0, kIconWidth, kIconHeight),
overflow_bar()->GetFrameForIndex(0));
EXPECT_EQ(gfx::Rect(kSpacing, kIconHeight * 2, kIconWidth, kIconHeight),
overflow_bar()->GetFrameForIndex(6));
}
|