chrome/browser/ui/webui/media_router/media_router_ui.cc - Issue 1826403002: [Media Router] Moves mojo-specific code into mojo/ folder

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_ui.cc

Issue 1826403002: [Media Router] Moves mojo-specific code into mojo/ folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/media/router/media_router_metrics.h ('K') | « chrome/browser/ui/toolbar/media_router_contextual_menu.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7bf21a1e359948f7252ebb8902ab7d130caa1020..cfccf4503b912f26d9fcd00c0523506cde5eb8b3 100644

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

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

@@ -22,12 +22,12 @@

#include "chrome/browser/media/router/media_router.h"

#include "chrome/browser/media/router/media_router_factory.h"

#include "chrome/browser/media/router/media_router_metrics.h"

-#include "chrome/browser/media/router/media_router_mojo_impl.h"

#include "chrome/browser/media/router/media_routes_observer.h"

#include "chrome/browser/media/router/media_sink.h"

#include "chrome/browser/media/router/media_sinks_observer.h"

#include "chrome/browser/media/router/media_source.h"

#include "chrome/browser/media/router/media_source_helper.h"

+#include "chrome/browser/media/router/mojo/media_router_mojo_impl.h"

#include "chrome/browser/media/router/presentation_service_delegate_impl.h"

#include "chrome/browser/media/router/route_request_result.h"

#include "chrome/browser/profiles/profile.h"

@@ -554,7 +554,7 @@ std::string MediaRouterUI::GetTruncatedPresentationRequestSourceName() const {

}

const std::string& MediaRouterUI::GetRouteProviderExtensionId() const {

- // TODO(imcheng): Get rid of this hack once we no longer need this method.

+ // TODO(crbug.com/597778): remove reference to MediaRouterMojoImpl

return static_cast<MediaRouterMojoImpl*>(router_)

->media_route_provider_extension_id();

}