Skip to content

GitLab

T
tangled
Commit 674259d3 authored by Takumi Fujimoto's avatar Takumi Fujimoto Committed by Commit Bot
Browse files
Options

Enable the ViewsCastDialog feature by default 

Enable the feature to replace the WebUI Cast dialog with a Views dialog
by default.

Bug: 754101
Change-Id: I80fff11bf849c44a49de2f93a95ede08986f6a78
Reviewed-on: https://chromium-review.googlesource.com/c/1464925
Commit-Queue: Takumi Fujimoto <takumif@chromium.org>
Reviewed-by: default avatarmark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632405}
parent dfc83d0d
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 112 deletions
chrome/browser/ui/toolbar/media_router_action_controller.h
View file @ 674259d3
......@@ -27,6 +27,8 @@ class MediaRouterActionController : public media_router::IssuesObserver,
public:
class Observer {
public:
virtual ~Observer() = default;
virtual void ShowIcon() = 0;
virtual void HideIcon() = 0;
// TODO(https://crbug.com/872392): Use the common code path to show and hide
......
chrome/browser/ui/toolbar/media_router_action_controller_unittest.cc
View file @ 674259d3
......@@ -42,6 +42,24 @@ class FakeComponentActionDelegate : public ComponentActionDelegate {
bool has_media_router_action_ = false;
};
class FakeCastToolbarIcon : public MediaRouterActionController::Observer {
public:
FakeCastToolbarIcon() = default;
~FakeCastToolbarIcon() override = default;
void ShowIcon() override { icon_shown_ = true; }
void HideIcon() override { icon_shown_ = false; }
void ActivateIcon() override {}
void DeactivateIcon() override {}
bool IsShown() const { return icon_shown_; }
private:
bool icon_shown_ = false;
};
class MediaRouterActionControllerUnitTest : public MediaRouterWebUITest {
public:
MediaRouterActionControllerUnitTest()
......@@ -63,6 +81,7 @@ class MediaRouterActionControllerUnitTest : public MediaRouterWebUITest {
std::make_unique<FakeComponentActionDelegate>();
controller_ = std::make_unique<MediaRouterActionController>(
profile(), router_.get(), component_action_delegate_.get());
controller_->AddObserver(&icon_);
SetAlwaysShowActionPref(false);
......@@ -81,10 +100,9 @@ class MediaRouterActionControllerUnitTest : public MediaRouterWebUITest {
MediaRouterWebUITest::TearDown();
}
bool ActionExists() {
bool IsIconShown() const {
base::RunLoop().RunUntilIdle();
return component_action_delegate_->HasComponentAction(
ComponentToolbarActionsFactory::kMediaRouterActionId);
return icon_.IsShown();
}
void SetAlwaysShowActionPref(bool always_show) {
......@@ -92,25 +110,11 @@ class MediaRouterActionControllerUnitTest : public MediaRouterWebUITest {
always_show);
}
MediaRouterActionController* controller() { return controller_.get(); }
const media_router::Issue& issue() { return issue_; }
const std::vector<media_router::MediaRoute>& local_display_route_list()
const {
return local_display_route_list_;
}
const std::vector<media_router::MediaRoute>& non_local_display_route_list()
const {
return non_local_display_route_list_;
}
const std::vector<media_router::MediaRoute::Id>& empty_route_id_list() const {
return empty_route_id_list_;
}
private:
protected:
std::unique_ptr<MediaRouterActionController> controller_;
std::unique_ptr<media_router::MockMediaRouter> router_;
std::unique_ptr<FakeComponentActionDelegate> component_action_delegate_;
FakeCastToolbarIcon icon_;
const media_router::Issue issue_;
......@@ -126,111 +130,107 @@ class MediaRouterActionControllerUnitTest : public MediaRouterWebUITest {
};
TEST_F(MediaRouterActionControllerUnitTest, EphemeralIconForRoutesAndIssues) {
EXPECT_FALSE(ActionExists());
EXPECT_FALSE(IsIconShown());
// Creating a local route should show the action icon.
controller()->OnRoutesUpdated(local_display_route_list(),
empty_route_id_list());
EXPECT_TRUE(controller()->has_local_display_route_);
EXPECT_TRUE(ActionExists());
controller_->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
EXPECT_TRUE(controller_->has_local_display_route_);
EXPECT_TRUE(IsIconShown());
// Removing the local route should hide the icon.
controller()->OnRoutesUpdated(non_local_display_route_list(),
empty_route_id_list());
EXPECT_FALSE(controller()->has_local_display_route_);
EXPECT_FALSE(ActionExists());
controller_->OnRoutesUpdated(non_local_display_route_list_,
empty_route_id_list_);
EXPECT_FALSE(controller_->has_local_display_route_);
EXPECT_FALSE(IsIconShown());
// Creating an issue should show the action icon.
controller()->OnIssue(issue());
EXPECT_TRUE(controller()->has_issue_);
EXPECT_TRUE(ActionExists());
controller_->OnIssue(issue_);
EXPECT_TRUE(controller_->has_issue_);
EXPECT_TRUE(IsIconShown());
// Removing the issue should hide the icon.
controller()->OnIssuesCleared();
EXPECT_FALSE(controller()->has_issue_);
EXPECT_FALSE(ActionExists());
controller()->OnIssue(issue());
controller()->OnRoutesUpdated(local_display_route_list(),
empty_route_id_list());
controller()->OnIssuesCleared();
controller_->OnIssuesCleared();
EXPECT_FALSE(controller_->has_issue_);
EXPECT_FALSE(IsIconShown());
controller_->OnIssue(issue_);
controller_->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
controller_->OnIssuesCleared();
// When the issue disappears, the icon should remain visible if there's
// a local route.
EXPECT_TRUE(ActionExists());
controller()->OnRoutesUpdated(std::vector<media_router::MediaRoute>(),
empty_route_id_list());
EXPECT_FALSE(ActionExists());
EXPECT_TRUE(IsIconShown());
controller_->OnRoutesUpdated(std::vector<media_router::MediaRoute>(),
empty_route_id_list_);
EXPECT_FALSE(IsIconShown());
}
TEST_F(MediaRouterActionControllerUnitTest, EphemeralIconForDialog) {
EXPECT_FALSE(ActionExists());
EXPECT_FALSE(IsIconShown());
// Showing a dialog should show the icon.
controller()->OnDialogShown();
EXPECT_TRUE(ActionExists());
controller_->OnDialogShown();
EXPECT_TRUE(IsIconShown());
// Showing and hiding a dialog shouldn't hide the icon as long as we have a
// positive number of dialogs.
controller()->OnDialogShown();
EXPECT_TRUE(ActionExists());
controller()->OnDialogHidden();
EXPECT_TRUE(ActionExists());
controller_->OnDialogShown();
EXPECT_TRUE(IsIconShown());
controller_->OnDialogHidden();
EXPECT_TRUE(IsIconShown());
// When we have zero dialogs, the icon should be hidden.
controller()->OnDialogHidden();
EXPECT_FALSE(ActionExists());
controller_->OnDialogHidden();
EXPECT_FALSE(IsIconShown());
controller()->OnDialogShown();
EXPECT_TRUE(ActionExists());
controller()->OnRoutesUpdated(local_display_route_list(),
empty_route_id_list());
controller_->OnDialogShown();
EXPECT_TRUE(IsIconShown());
controller_->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
// Hiding the dialog while there are local routes shouldn't hide the icon.
controller()->OnDialogHidden();
EXPECT_TRUE(ActionExists());
controller()->OnRoutesUpdated(non_local_display_route_list(),
empty_route_id_list());
EXPECT_FALSE(ActionExists());
controller()->OnDialogShown();
EXPECT_TRUE(ActionExists());
controller()->OnIssue(issue());
controller_->OnDialogHidden();
EXPECT_TRUE(IsIconShown());
controller_->OnRoutesUpdated(non_local_display_route_list_,
empty_route_id_list_);
EXPECT_FALSE(IsIconShown());
controller_->OnDialogShown();
EXPECT_TRUE(IsIconShown());
controller_->OnIssue(issue_);
// Hiding the dialog while there is an issue shouldn't hide the icon.
controller()->OnDialogHidden();
EXPECT_TRUE(ActionExists());
controller()->OnIssuesCleared();
EXPECT_FALSE(ActionExists());
controller_->OnDialogHidden();
EXPECT_TRUE(IsIconShown());
controller_->OnIssuesCleared();
EXPECT_FALSE(IsIconShown());
}
TEST_F(MediaRouterActionControllerUnitTest, EphemeralIconForContextMenu) {
EXPECT_FALSE(ActionExists());
EXPECT_FALSE(IsIconShown());
controller()->OnDialogShown();
EXPECT_TRUE(ActionExists());
controller()->OnDialogHidden();
controller()->OnContextMenuShown();
controller_->OnDialogShown();
EXPECT_TRUE(IsIconShown());
controller_->OnDialogHidden();
controller_->OnContextMenuShown();
// Hiding the dialog immediately before showing a context menu shouldn't hide
// the icon.
EXPECT_TRUE(ActionExists());
EXPECT_TRUE(IsIconShown());
// Hiding the context menu should hide the icon.
controller()->OnContextMenuHidden();
EXPECT_FALSE(ActionExists());
controller_->OnContextMenuHidden();
EXPECT_FALSE(IsIconShown());
}
TEST_F(MediaRouterActionControllerUnitTest, ObserveAlwaysShowPrefChange) {
EXPECT_FALSE(ActionExists());
EXPECT_FALSE(IsIconShown());
SetAlwaysShowActionPref(true);
EXPECT_TRUE(ActionExists());
EXPECT_TRUE(IsIconShown());
controller()->OnRoutesUpdated(local_display_route_list(),
empty_route_id_list());
controller_->OnRoutesUpdated(local_display_route_list_, empty_route_id_list_);
SetAlwaysShowActionPref(false);
// Unchecking the option while having a local route shouldn't hide the icon.
EXPECT_TRUE(ActionExists());
EXPECT_TRUE(IsIconShown());
SetAlwaysShowActionPref(true);
controller()->OnRoutesUpdated(non_local_display_route_list(),
empty_route_id_list());
controller_->OnRoutesUpdated(non_local_display_route_list_,
empty_route_id_list_);
// Removing the local route should not hide the icon.
EXPECT_TRUE(ActionExists());
EXPECT_TRUE(IsIconShown());
SetAlwaysShowActionPref(false);
EXPECT_FALSE(ActionExists());
EXPECT_FALSE(IsIconShown());
}
chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc
View file @ 674259d3
......@@ -34,7 +34,6 @@ namespace {
// These constants are used to inject the state of the Media Router action
// that would be inferred in the production code.
constexpr bool kInToolbar = true;
constexpr bool kInOverflowMenu = false;
constexpr bool kShownByPolicy = true;
constexpr bool kShownByUser = false;
......@@ -276,30 +275,6 @@ TEST_F(MediaRouterContextualMenuUnitTest, ActionShownByPolicy) {
IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION));
}
TEST_F(MediaRouterContextualMenuUnitTest, HideActionInOverflowItem) {
MediaRouterContextualMenu menu(browser(), kInToolbar, kShownByUser,
&observer_);
// When the action icon is in the toolbar, this menu item should say "Hide
// in Chrome menu".
const base::string16& menu_item_label = menu.menu_model()->GetLabelAt(
menu.menu_model()->GetIndexOfCommandId(IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR));
EXPECT_EQ(menu_item_label,
l10n_util::GetStringUTF16(IDS_EXTENSIONS_HIDE_BUTTON_IN_MENU));
}
TEST_F(MediaRouterContextualMenuUnitTest, ShowActionInToolbarItem) {
MediaRouterContextualMenu menu(browser(), kInOverflowMenu, kShownByUser,
&observer_);
// When the action icon is in the overflow menu, this menu item should say
// "Show in toolbar".
const base::string16& menu_item_label = menu.menu_model()->GetLabelAt(
menu.menu_model()->GetIndexOfCommandId(IDC_MEDIA_ROUTER_SHOW_IN_TOOLBAR));
EXPECT_EQ(menu_item_label,
l10n_util::GetStringUTF16(IDS_EXTENSIONS_SHOW_BUTTON_IN_TOOLBAR));
}
TEST_F(MediaRouterContextualMenuUnitTest, NotifyActionController) {
EXPECT_CALL(observer_, OnContextMenuShown());
auto menu = std::make_unique<MediaRouterContextualMenu>(
......
chrome/browser/ui/views/media_router/cast_toolbar_button.cc
View file @ 674259d3
......@@ -26,6 +26,12 @@ namespace media_router {
// static
std::unique_ptr<CastToolbarButton> CastToolbarButton::Create(Browser* browser) {
// These objects may be null in tests.
if (!MediaRouterUIService::Get(browser->profile()) ||
!MediaRouterFactory::GetApiForBrowserContext(browser->profile())) {
return nullptr;
}
std::unique_ptr<MediaRouterContextualMenu> context_menu =
MediaRouterContextualMenu::CreateForToolbar(
browser,
......
chrome/common/chrome_features.cc
View file @ 674259d3
......@@ -323,7 +323,7 @@ const base::Feature kHappinessTrackingSurveysForDesktop{
#if !defined(OS_ANDROID)
// Replaces the WebUI Cast dialog with a Views toolkit one.
const base::Feature kViewsCastDialog{"ViewsCastDialog",
base::FEATURE_DISABLED_BY_DEFAULT};
base::FEATURE_ENABLED_BY_DEFAULT};
#endif // !defined(OS_ANDROID)
// Enables navigation suggestions UI for lookalike URLs (e.g. internationalized
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment