chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc - Issue 1476053002: [Media Router] Only keep track of toolbar MediaRouterAction in MediaRouterDialogControllerImpl.

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

Unified Diff: chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

Issue 1476053002: [Media Router] Only keep track of toolbar MediaRouterAction in MediaRouterDialogControllerImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

index 3dd189004c802e0a6c159d289baf619a43b6c515..36a534fb28345796d580a7b1ca04c5b59ed74bb8 100644

--- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

+++ b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.cc

@@ -172,7 +172,8 @@ WebContents* MediaRouterDialogControllerImpl::GetMediaRouterDialog() const {

void MediaRouterDialogControllerImpl::SetMediaRouterAction(

const base::WeakPtr<MediaRouterAction>& action) {

- action_ = action;

+ if (!action_)

+ action_ = action;

}

bool MediaRouterDialogControllerImpl::IsShowingMediaRouterDialog() const {

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