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

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: Deleted the first patch set on accident, responded to Mark's comments inline below Created 4 years, 2 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 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"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 MediaRouterTest {
80 public: 80 public:
81 MediaRouterActionUnitTest() 81 MediaRouterActionUnitTest()
82 : toolbar_model_(nullptr), 82 : MediaRouterTest(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 269 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