| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h" | 5 #include "chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h" | 11 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h" |
| 12 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h" |
| 13 #include "chrome/grit/generated_resources.h" |
| 14 #include "components/grit/components_scaled_resources.h" |
| 15 #include "ui/base/l10n/l10n_util.h" |
| 16 #include "ui/base/resource/resource_bundle.h" |
| 12 #include "ui/events/event_utils.h" | 17 #include "ui/events/event_utils.h" |
| 13 #include "ui/events/test/event_generator.h" | 18 #include "ui/events/test/event_generator.h" |
| 19 #include "ui/gfx/color_palette.h" |
| 20 #include "ui/gfx/image/image.h" |
| 21 #include "ui/gfx/image/image_unittest_util.h" |
| 22 #include "ui/gfx/paint_vector_icon.h" |
| 23 #include "ui/gfx/vector_icons_public.h" |
| 14 #include "ui/views/controls/button/label_button.h" | 24 #include "ui/views/controls/button/label_button.h" |
| 15 #include "ui/views/controls/link.h" | 25 #include "ui/views/controls/link.h" |
| 16 #include "ui/views/test/test_widget_observer.h" | 26 #include "ui/views/test/test_widget_observer.h" |
| 17 #include "ui/views/test/views_test_base.h" | 27 #include "ui/views/test/views_test_base.h" |
| 18 #include "ui/views/widget/widget.h" | 28 #include "ui/views/widget/widget.h" |
| 19 #include "ui/views/window/dialog_client_view.h" | 29 #include "ui/views/window/dialog_client_view.h" |
| 20 | 30 |
| 31 namespace { |
| 32 const int kIconSize = 16; |
| 33 } |
| 34 |
| 21 class ToolbarActionsBarBubbleViewsTest : public views::ViewsTestBase { | 35 class ToolbarActionsBarBubbleViewsTest : public views::ViewsTestBase { |
| 36 public: |
| 37 views::View* TestCreateExtraView() { |
| 38 DCHECK(bubble_); |
| 39 return bubble_->CreateExtraView(); |
| 40 } |
| 41 |
| 22 protected: | 42 protected: |
| 23 ToolbarActionsBarBubbleViewsTest() {} | 43 ToolbarActionsBarBubbleViewsTest() {} |
| 24 ~ToolbarActionsBarBubbleViewsTest() override {} | 44 ~ToolbarActionsBarBubbleViewsTest() override {} |
| 25 | 45 |
| 26 void TearDown() override { | 46 void TearDown() override { |
| 27 anchor_widget_.reset(); | 47 anchor_widget_.reset(); |
| 28 views::ViewsTestBase::TearDown(); | 48 views::ViewsTestBase::TearDown(); |
| 29 } | 49 } |
| 30 | 50 |
| 31 std::unique_ptr<views::Widget> CreateAnchorWidget() { | 51 std::unique_ptr<views::Widget> CreateAnchorWidget() { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 ShowBubble(&delegate); | 112 ShowBubble(&delegate); |
| 93 | 113 |
| 94 EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button()); | 114 EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button()); |
| 95 EXPECT_EQ(ActionString(), | 115 EXPECT_EQ(ActionString(), |
| 96 bubble()->GetDialogClientView()->ok_button()->GetText()); | 116 bubble()->GetDialogClientView()->ok_button()->GetText()); |
| 97 EXPECT_FALSE(bubble()->GetDialogClientView()->cancel_button()); | 117 EXPECT_FALSE(bubble()->GetDialogClientView()->cancel_button()); |
| 98 | 118 |
| 99 CloseBubble(); | 119 CloseBubble(); |
| 100 } | 120 } |
| 101 | 121 |
| 122 TEST_F(ToolbarActionsBarBubbleViewsTest, TestBubbleLayoutNoButtons) { |
| 123 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), |
| 124 ActionString()); |
| 125 ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info; |
| 126 delegate.set_extra_view_info(extra_view_info); |
| 127 delegate.set_dismiss_button_text(base::string16()); |
| 128 delegate.set_action_button_text(base::string16()); |
| 129 ShowBubble(&delegate); |
| 130 |
| 131 std::unique_ptr<views::View> extra_view(TestCreateExtraView()); |
| 132 EXPECT_FALSE(bubble()->GetDialogClientView()->ok_button()); |
| 133 EXPECT_FALSE(bubble()->GetDialogClientView()->cancel_button()); |
| 134 EXPECT_FALSE(bubble()->learn_more_button()); |
| 135 |
| 136 CloseBubble(); |
| 137 } |
| 138 |
| 102 TEST_F(ToolbarActionsBarBubbleViewsTest, | 139 TEST_F(ToolbarActionsBarBubbleViewsTest, |
| 103 TestBubbleLayoutActionAndDismissButton) { | 140 TestBubbleLayoutActionAndDismissButton) { |
| 104 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), | 141 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), |
| 105 ActionString()); | 142 ActionString()); |
| 106 delegate.set_dismiss_button_text(DismissString()); | 143 delegate.set_dismiss_button_text(DismissString()); |
| 107 | |
| 108 ShowBubble(&delegate); | 144 ShowBubble(&delegate); |
| 109 | 145 |
| 110 EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button()); | 146 EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button()); |
| 111 EXPECT_EQ(ActionString(), | 147 EXPECT_EQ(ActionString(), |
| 112 bubble()->GetDialogClientView()->ok_button()->GetText()); | 148 bubble()->GetDialogClientView()->ok_button()->GetText()); |
| 113 EXPECT_TRUE(bubble()->GetDialogClientView()->cancel_button()); | 149 EXPECT_TRUE(bubble()->GetDialogClientView()->cancel_button()); |
| 114 EXPECT_EQ(DismissString(), | 150 EXPECT_EQ(DismissString(), |
| 115 bubble()->GetDialogClientView()->cancel_button()->GetText()); | 151 bubble()->GetDialogClientView()->cancel_button()->GetText()); |
| 116 | 152 |
| 117 EXPECT_FALSE(bubble()->learn_more_button()); | 153 EXPECT_FALSE(bubble()->learn_more_button()); |
| 118 EXPECT_FALSE(bubble()->item_list()); | 154 EXPECT_FALSE(bubble()->item_list()); |
| 119 | 155 |
| 120 CloseBubble(); | 156 CloseBubble(); |
| 121 } | 157 } |
| 122 | 158 |
| 123 TEST_F(ToolbarActionsBarBubbleViewsTest, | 159 TEST_F(ToolbarActionsBarBubbleViewsTest, |
| 124 TestBubbleLayoutActionDismissAndLearnMoreButton) { | 160 TestBubbleLayoutActionDismissAndLearnMoreButton) { |
| 125 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), | 161 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), |
| 126 ActionString()); | 162 ActionString()); |
| 127 delegate.set_dismiss_button_text(DismissString()); | 163 delegate.set_dismiss_button_text(DismissString()); |
| 128 delegate.set_learn_more_button_text(LearnMoreString()); | 164 |
| 165 ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text; |
| 166 |
| 167 extra_view_info_linked_text.text = LearnMoreString(); |
| 168 extra_view_info_linked_text.is_text_linked = true; |
| 169 delegate.set_extra_view_info(extra_view_info_linked_text); |
| 170 |
| 129 ShowBubble(&delegate); | 171 ShowBubble(&delegate); |
| 130 | 172 |
| 131 EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button()); | 173 EXPECT_TRUE(bubble()->GetDialogClientView()->ok_button()); |
| 132 EXPECT_EQ(ActionString(), | 174 EXPECT_EQ(ActionString(), |
| 133 bubble()->GetDialogClientView()->ok_button()->GetText()); | 175 bubble()->GetDialogClientView()->ok_button()->GetText()); |
| 134 EXPECT_TRUE(bubble()->GetDialogClientView()->cancel_button()); | 176 EXPECT_TRUE(bubble()->GetDialogClientView()->cancel_button()); |
| 135 EXPECT_EQ(DismissString(), | 177 EXPECT_EQ(DismissString(), |
| 136 bubble()->GetDialogClientView()->cancel_button()->GetText()); | 178 bubble()->GetDialogClientView()->cancel_button()->GetText()); |
| 137 EXPECT_TRUE(bubble()->learn_more_button()); | 179 EXPECT_TRUE(bubble()->learn_more_button()); |
| 138 EXPECT_EQ(LearnMoreString(), bubble()->learn_more_button()->text()); | 180 EXPECT_EQ(LearnMoreString(), bubble()->learn_more_button()->text()); |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 ShowBubble(&delegate); | 295 ShowBubble(&delegate); |
| 254 views::test::TestWidgetObserver bubble_observer(bubble_widget()); | 296 views::test::TestWidgetObserver bubble_observer(bubble_widget()); |
| 255 | 297 |
| 256 EXPECT_FALSE(delegate.close_action()); | 298 EXPECT_FALSE(delegate.close_action()); |
| 257 // Activate another widget. The bubble shouldn't close. | 299 // Activate another widget. The bubble shouldn't close. |
| 258 anchor_widget()->Activate(); | 300 anchor_widget()->Activate(); |
| 259 base::RunLoop().RunUntilIdle(); | 301 base::RunLoop().RunUntilIdle(); |
| 260 EXPECT_FALSE(delegate.close_action()); | 302 EXPECT_FALSE(delegate.close_action()); |
| 261 CloseBubble(); | 303 CloseBubble(); |
| 262 } | 304 } |
| 305 |
| 306 TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewIconOnly) { |
| 307 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), |
| 308 ActionString()); |
| 309 ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info; |
| 310 |
| 311 extra_view_info.resource_id = gfx::VectorIconId::BUSINESS; |
| 312 delegate.set_extra_view_info(extra_view_info); |
| 313 ShowBubble(&delegate); |
| 314 std::unique_ptr<views::View> extra_view(TestCreateExtraView()); |
| 315 ASSERT_TRUE(extra_view); |
| 316 ASSERT_EQ("ImageView", std::string(extra_view->GetClassName())); |
| 317 EXPECT_TRUE(gfx::test::AreImagesEqual( |
| 318 gfx::Image(static_cast<views::ImageView*>(extra_view.get())->GetImage()), |
| 319 gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BUSINESS, kIconSize, |
| 320 gfx::kChromeIconGrey)))); |
| 321 CloseBubble(); |
| 322 } |
| 323 |
| 324 TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewLinkedTextOnly) { |
| 325 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), |
| 326 ActionString()); |
| 327 ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info_linked_text; |
| 328 |
| 329 extra_view_info_linked_text.text = |
| 330 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN); |
| 331 extra_view_info_linked_text.is_text_linked = true; |
| 332 delegate.set_extra_view_info(extra_view_info_linked_text); |
| 333 |
| 334 ShowBubble(&delegate); |
| 335 |
| 336 std::unique_ptr<views::View> extra_view(TestCreateExtraView()); |
| 337 ASSERT_TRUE(extra_view); |
| 338 ASSERT_EQ("Link", std::string(extra_view->GetClassName())); |
| 339 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN), |
| 340 static_cast<views::Label*>(extra_view.get())->text()); |
| 341 CloseBubble(); |
| 342 } |
| 343 |
| 344 TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewLabelTextOnly) { |
| 345 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), |
| 346 ActionString()); |
| 347 ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info; |
| 348 |
| 349 extra_view_info.text = |
| 350 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN); |
| 351 extra_view_info.is_text_linked = false; |
| 352 delegate.set_extra_view_info(extra_view_info); |
| 353 |
| 354 ShowBubble(&delegate); |
| 355 |
| 356 std::unique_ptr<views::View> extra_view(TestCreateExtraView()); |
| 357 ASSERT_TRUE(extra_view); |
| 358 EXPECT_EQ("Label", std::string(extra_view->GetClassName())); |
| 359 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN), |
| 360 static_cast<views::Label*>(extra_view.get())->text()); |
| 361 CloseBubble(); |
| 362 } |
| 363 |
| 364 TEST_F(ToolbarActionsBarBubbleViewsTest, TestCreateExtraViewImageAndText) { |
| 365 TestToolbarActionsBarBubbleDelegate delegate(HeadingString(), BodyString(), |
| 366 ActionString()); |
| 367 ToolbarActionsBarBubbleDelegate::ExtraViewInfo extra_view_info; |
| 368 extra_view_info.resource_id = gfx::VectorIconId::BUSINESS; |
| 369 extra_view_info.text = |
| 370 l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN); |
| 371 extra_view_info.is_text_linked = false; |
| 372 delegate.set_extra_view_info(extra_view_info); |
| 373 |
| 374 ShowBubble(&delegate); |
| 375 |
| 376 std::unique_ptr<views::View> extra_view(TestCreateExtraView()); |
| 377 ASSERT_TRUE(extra_view); |
| 378 EXPECT_EQ("View", std::string(extra_view->GetClassName())); |
| 379 EXPECT_EQ(2, extra_view->child_count()); |
| 380 |
| 381 for (int i = 0; i < 2; i++) { |
| 382 const views::View* v = extra_view->child_at(i); |
| 383 std::string class_name = v->GetClassName(); |
| 384 ASSERT_TRUE(class_name == "Label" || class_name == "ImageView"); |
| 385 if (class_name == "Label") { |
| 386 EXPECT_EQ(l10n_util::GetStringUTF16(IDS_EXTENSIONS_INSTALLED_BY_ADMIN), |
| 387 static_cast<const views::Label*>(v)->text()); |
| 388 } else { |
| 389 EXPECT_TRUE(gfx::test::AreImagesEqual( |
| 390 gfx::Image(static_cast<const views::ImageView*>(v)->GetImage()), |
| 391 gfx::Image(gfx::CreateVectorIcon(gfx::VectorIconId::BUSINESS, |
| 392 kIconSize, gfx::kChromeIconGrey)))); |
| 393 } |
| 394 } |
| 395 |
| 396 CloseBubble(); |
| 397 } |
| OLD | NEW |