chrome/browser/ui/webui/media_router/media_router_ui.cc - Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android.

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 1228863005: [MediaRouter] The minimal change to make everything build on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed the include for MediaRouterDialogControllerImpl Created 5 years, 5 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/ui/webui/media_router/media_router_dialog_controller_impl.h ('K') | « chrome/browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | chrome/chrome_browser.gypi » ('J')
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 d015f12360434ca4847363658fe03ff8578dea38..c214dd2cee60ddb4c05f5e4372e8904239be58f7 100644

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

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

@@ -12,8 +12,8 @@

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

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

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

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

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

-#include "chrome/browser/media/router/media_router_mojo_impl_factory.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"

@@ -22,7 +22,7 @@

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

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

#include "chrome/browser/sessions/session_tab_helper.h"

-#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller.h"

+#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_impl.h"

mark a. foltz 2015/07/22 21:16:39 Was this change intentional?

whywhat 2015/07/22 22:55:01 Yes, to avoid breaking the file. It seems to be un

#include "chrome/browser/ui/webui/media_router/media_router_localized_strings_provider.h"

#include "chrome/browser/ui/webui/media_router/media_router_resources_provider.h"

#include "chrome/browser/ui/webui/media_router/media_router_webui_message_handler.h"

@@ -116,7 +116,7 @@ MediaRouterUI::MediaRouterUI(content::WebUI* web_ui)

content::WebContents* wc = web_ui->GetWebContents();

DCHECK(wc);

- router_ = MediaRouterMojoImplFactory::GetApiForBrowserContext(

+ router_ = MediaRouterFactory::GetApiForBrowserContext(

wc->GetBrowserContext());

DCHECK(router_);