Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(311)

Side by Side Diff: chrome/browser/ui/toolbar/media_router_action_unittest.cc

Issue 2410553002: Show Media Router toolbar icon ephemerally for MR dialogs (Closed)
Patch Set: Address Mike's comments Created 4 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "chrome/browser/extensions/browser_action_test_util.h" 6 #include "chrome/browser/extensions/browser_action_test_util.h"
7 #include "chrome/browser/extensions/extension_action_test_util.h" 7 #include "chrome/browser/extensions/extension_action_test_util.h"
8 #include "chrome/browser/ui/browser_commands.h" 8 #include "chrome/browser/ui/browser_commands.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/browser/ui/toolbar/media_router_action.h" 10 #include "chrome/browser/ui/toolbar/media_router_action.h"
11 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" 11 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
12 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h" 12 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h"
13 #include "chrome/browser/ui/webui/media_router/media_router_test.h" 13 #include "chrome/browser/ui/webui/media_router/media_router_web_ui_test.h"
14 #include "chrome/grit/generated_resources.h" 14 #include "chrome/grit/generated_resources.h"
15 #include "content/public/browser/site_instance.h" 15 #include "content/public/browser/site_instance.h"
16 #include "content/public/test/test_utils.h" 16 #include "content/public/test/test_utils.h"
17 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/gfx/color_palette.h" 19 #include "ui/gfx/color_palette.h"
20 #include "ui/gfx/image/image_unittest_util.h" 20 #include "ui/gfx/image/image_unittest_util.h"
21 #include "ui/gfx/paint_vector_icon.h" 21 #include "ui/gfx/paint_vector_icon.h"
22 22
23 using content::WebContents; 23 using content::WebContents;
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 return controller_; 69 return controller_;
70 } 70 }
71 MediaRouterActionPlatformDelegate* GetPlatformDelegate() override { 71 MediaRouterActionPlatformDelegate* GetPlatformDelegate() override {
72 return platform_delegate_; 72 return platform_delegate_;
73 } 73 }
74 74
75 MediaRouterDialogControllerImpl* controller_; 75 MediaRouterDialogControllerImpl* controller_;
76 MediaRouterActionPlatformDelegate* platform_delegate_; 76 MediaRouterActionPlatformDelegate* platform_delegate_;
77 }; 77 };
78 78
79 class MediaRouterActionUnitTest : public MediaRouterTest { 79 class MediaRouterActionUnitTest : public MediaRouterWebUITest {
80 public: 80 public:
81 MediaRouterActionUnitTest() 81 MediaRouterActionUnitTest()
82 : toolbar_model_(nullptr), 82 : MediaRouterWebUITest(true),
83 toolbar_model_(nullptr),
83 fake_issue_notification_(media_router::Issue( 84 fake_issue_notification_(media_router::Issue(
84 "title notification", 85 "title notification",
85 "message notification", 86 "message notification",
86 media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS), 87 media_router::IssueAction(media_router::IssueAction::TYPE_DISMISS),
87 std::vector<media_router::IssueAction>(), 88 std::vector<media_router::IssueAction>(),
88 "route_id", 89 "route_id",
89 media_router::Issue::NOTIFICATION, 90 media_router::Issue::NOTIFICATION,
90 false, 91 false,
91 -1)), 92 -1)),
92 fake_issue_warning_( 93 fake_issue_warning_(
(...skipping 17 matching lines...) Expand all
110 -1)), 111 -1)),
111 fake_source1_("fakeSource1"), 112 fake_source1_("fakeSource1"),
112 fake_source2_("fakeSource2"), 113 fake_source2_("fakeSource2"),
113 active_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE)), 114 active_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ACTIVE)),
114 error_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR)), 115 error_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_ERROR)),
115 idle_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE)), 116 idle_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_IDLE)),
116 warning_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING)) {} 117 warning_icon_(GetIcon(gfx::VectorIconId::MEDIA_ROUTER_WARNING)) {}
117 118
118 ~MediaRouterActionUnitTest() override {} 119 ~MediaRouterActionUnitTest() override {}
119 120
120 // MediaRouterTest: 121 // MediaRouterWebUITest:
121 void SetUp() override { 122 void SetUp() override {
122 MediaRouterTest::SetUp(); 123 MediaRouterWebUITest::SetUp();
123 toolbar_model_ = 124 toolbar_model_ =
124 extensions::extension_action_test_util::CreateToolbarModelForProfile( 125 extensions::extension_action_test_util::CreateToolbarModelForProfile(
125 profile()); 126 profile());
126 127
127 // browser() will only be valid once BrowserWithTestWindowTest::SetUp() 128 // browser() will only be valid once BrowserWithTestWindowTest::SetUp()
128 // has run. 129 // has run.
129 browser_action_test_util_.reset( 130 browser_action_test_util_.reset(
130 new BrowserActionTestUtil(browser(), false)); 131 new BrowserActionTestUtil(browser(), false));
131 action_.reset( 132 action_.reset(
132 new TestMediaRouterAction( 133 new TestMediaRouterAction(
133 browser(), 134 browser(),
134 browser_action_test_util_->GetToolbarActionsBar())); 135 browser_action_test_util_->GetToolbarActionsBar()));
135 136
136 local_display_route_list_.push_back( 137 local_display_route_list_.push_back(
137 media_router::MediaRoute("routeId1", fake_source1_, "sinkId1", 138 media_router::MediaRoute("routeId1", fake_source1_, "sinkId1",
138 "description", true, std::string(), true)); 139 "description", true, std::string(), true));
139 non_local_display_route_list_.push_back( 140 non_local_display_route_list_.push_back(
140 media_router::MediaRoute("routeId2", fake_source1_, "sinkId2", 141 media_router::MediaRoute("routeId2", fake_source1_, "sinkId2",
141 "description", false, std::string(), true)); 142 "description", false, std::string(), true));
142 non_local_display_route_list_.push_back( 143 non_local_display_route_list_.push_back(
143 media_router::MediaRoute("routeId3", fake_source2_, "sinkId3", 144 media_router::MediaRoute("routeId3", fake_source2_, "sinkId3",
144 "description", true, std::string(), false)); 145 "description", true, std::string(), false));
145 } 146 }
146 147
147 void TearDown() override { 148 void TearDown() override {
148 action_.reset(); 149 action_.reset();
149 browser_action_test_util_.reset(); 150 browser_action_test_util_.reset();
150 MediaRouterTest::TearDown(); 151 MediaRouterWebUITest::TearDown();
151 } 152 }
152 153
153 gfx::Image GetIcon(gfx::VectorIconId icon_id) { 154 gfx::Image GetIcon(gfx::VectorIconId icon_id) {
154 return gfx::Image(gfx::CreateVectorIcon( 155 return gfx::Image(gfx::CreateVectorIcon(
155 icon_id, MediaRouterAction::GetIconColor(icon_id))); 156 icon_id, MediaRouterAction::GetIconColor(icon_id)));
156 } 157 }
157 158
158 TestMediaRouterAction* action() { return action_.get(); } 159 TestMediaRouterAction* action() { return action_.get(); }
159 const media_router::Issue* fake_issue_notification() { 160 const media_router::Issue* fake_issue_notification() {
160 return &fake_issue_notification_; 161 return &fake_issue_notification_;
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1); 363 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
363 action()->ExecuteAction(true); 364 action()->ExecuteAction(true);
364 EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog()); 365 EXPECT_FALSE(dialog_controller->IsShowingMediaRouterDialog());
365 366
366 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1); 367 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).Times(1);
367 dialog_controller->CreateMediaRouterDialog(); 368 dialog_controller->CreateMediaRouterDialog();
368 369
369 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1); 370 EXPECT_CALL(*mock_delegate, OnPopupClosed()).Times(1);
370 dialog_controller->HideMediaRouterDialog(); 371 dialog_controller->HideMediaRouterDialog();
371 } 372 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698