chrome/browser/ui/toolbar/media_router_action_unittest.cc - Issue 1308853008: Release Media Router Action icon when dialog closed.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1308853008: Release Media Router Action icon when dialog closed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 3 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

« no previous file with comments | « no previous file | chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc » ('j') | no next file with comments »

OLD	NEW
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 "chrome/browser/ui/browser_commands.h"	5 #include "chrome/browser/ui/browser_commands.h"

6 #include "chrome/browser/ui/tabs/tab_strip_model.h"	6 #include "chrome/browser/ui/tabs/tab_strip_model.h"

7 #include "chrome/browser/ui/toolbar/media_router_action.h"	7 #include "chrome/browser/ui/toolbar/media_router_action.h"

8 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"	8 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"

9 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h"	9 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h"

10 #include "chrome/browser/ui/webui/media_router/media_router_test.h"	10 #include "chrome/browser/ui/webui/media_router/media_router_test.h"

(...skipping 324 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
335 testing::Return(initiator_));	335 testing::Return(initiator_));

336 EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());	336 EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());

337 action()->SetDelegate(mock_delegate.get());	337 action()->SetDelegate(mock_delegate.get());

338	338

339 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).WillOnce(testing::Return());	339 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).WillOnce(testing::Return());

340 action()->ExecuteAction(true);	340 action()->ExecuteAction(true);

341	341

342 EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());	342 EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());

343 dialog_controller_->CloseMediaRouterDialog();	343 dialog_controller_->CloseMediaRouterDialog();

344	344

	345 EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());

345 dialog_controller_->Reset();	346 dialog_controller_->Reset();

	347

346 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).WillOnce(testing::Return());	348 EXPECT_CALL(*mock_delegate, OnPopupShown(true)).WillOnce(testing::Return());

347 dialog_controller_->CreateMediaRouterDialog();	349 dialog_controller_->CreateMediaRouterDialog();

348	350

349 EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());	351 EXPECT_CALL(*mock_delegate, OnPopupClosed()).WillOnce(testing::Return());

350 dialog_controller_->CloseMediaRouterDialog();	352 dialog_controller_->CloseMediaRouterDialog();

351 }	353 }

OLD	NEW