chrome/browser/media/router/media_router_mojo_impl.h - Issue 1507743005: [MediaRouter] Renames CloseRoute() to Terminate() and creates DetachRoute()

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/media/router/media_router_mojo_impl.h

Issue 1507743005: [MediaRouter] Renames CloseRoute() to Terminate() and creates DetachRoute() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Forgot a call to DetachRoute! Created 5 years 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

« chrome/browser/media/router/media_router_metrics.h ('K') | « chrome/browser/media/router/media_router_metrics.h ('k') | chrome/browser/media/router/media_router_mojo_impl.cc » ('j') | chrome/browser/media/router/presentation_service_delegate_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/router/media_router_mojo_impl.h

diff --git a/chrome/browser/media/router/media_router_mojo_impl.h b/chrome/browser/media/router/media_router_mojo_impl.h

index 2b8904c7e8bd3bc731afc605fb8a14b2f247bdb4..bf70ce3aab6437012c5e68a8b9eaf3af82fd8783 100644

--- a/chrome/browser/media/router/media_router_mojo_impl.h

+++ b/chrome/browser/media/router/media_router_mojo_impl.h

@@ -74,7 +74,8 @@ class MediaRouterMojoImpl : public MediaRouterBase,

const GURL& origin,

content::WebContents* web_contents,

const std::vector<MediaRouteResponseCallback>& callbacks) override;

- void CloseRoute(const MediaRoute::Id& route_id) override;

+ void TerminateRoute(const MediaRoute::Id& route_id) override;

+ void DetachRoute(const MediaRoute::Id& route_id) override;

void SendRouteMessage(const MediaRoute::Id& route_id,

const std::string& message,

const SendRouteMessageCallback& callback) override;

@@ -84,7 +85,6 @@ class MediaRouterMojoImpl : public MediaRouterBase,

const SendRouteMessageCallback& callback) override;

void AddIssue(const Issue& issue) override;

void ClearIssue(const Issue::Id& issue_id) override;

- void OnPresentationSessionDetached(const MediaRoute::Id& route_id) override;

bool HasLocalDisplayRoute() const override;

const std::string& media_route_provider_extension_id() const {

@@ -212,7 +212,8 @@ class MediaRouterMojoImpl : public MediaRouterBase,

const std::string& origin,

int tab_id,

const std::vector<MediaRouteResponseCallback>& callbacks);

- void DoCloseRoute(const MediaRoute::Id& route_id);

+ void DoTerminateRoute(const MediaRoute::Id& route_id);

+ void DoDetachRoute(const MediaRoute::Id& route_id);

void DoSendSessionMessage(const MediaRoute::Id& route_id,

const std::string& message,

const SendRouteMessageCallback& callback);

@@ -221,7 +222,6 @@ class MediaRouterMojoImpl : public MediaRouterBase,

const SendRouteMessageCallback& callback);

void DoListenForRouteMessages(const MediaRoute::Id& route_id);

void DoStopListeningForRouteMessages(const MediaRoute::Id& route_id);

- void DoOnPresentationSessionDetached(const MediaRoute::Id& route_id);

void DoStartObservingMediaSinks(const MediaSource::Id& source_id);

void DoStopObservingMediaSinks(const MediaSource::Id& source_id);

void DoStartObservingMediaRoutes();