chrome/browser/media/router/media_router.gyp - 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/media/router/media_router.gyp

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

« no previous file with comments | « chrome/browser/media/router/BUILD.gn ('k') | chrome/browser/media/router/media_router.gypi » ('j') | chrome/browser/media/router/media_router_metrics.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/media/router/media_router.gyp

diff --git a/chrome/browser/media/router/media_router.gyp b/chrome/browser/media/router/media_router.gyp

index 7c33a46a83e3bcd72bacee2672f6aec7bb534c74..84b9eef7e4c06859ca39d3e6b38e3eafc6138cae 100644

--- a/chrome/browser/media/router/media_router.gyp

+++ b/chrome/browser/media/router/media_router.gyp

@@ -44,7 +44,7 @@

'target_name': 'media_router_mojo_gen',

'type': 'none',

'sources': [

- 'media_router.mojom',

+ 'mojo/media_router.mojom',

'includes': [

'../../../../mojo/mojom_bindings_generator.gypi',

@@ -57,8 +57,8 @@

'media_router_mojo_gen',

'sources': [

- '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/media_router.mojom.cc',

- '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/media_router.mojom.h',

+ '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/mojo/media_router.mojom.cc',

+ '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/media/router/mojo/media_router.mojom.h',

{

@@ -70,9 +70,6 @@

'dependencies': [

'media_router',

- # TODO(crbug.com/596999): Move non-Android code to mojo/

- 'media_router_mojo',

- 'media_router_mojo_gen',

'<(DEPTH)/base/base.gyp:base',

'<(DEPTH)/testing/gmock.gyp:gmock',

@@ -82,6 +79,8 @@

'conditions': [

[ 'OS!="android" and OS!="ios"', {

'dependencies': [

+ 'media_router_mojo',

+ 'media_router_mojo_gen',

'<(DEPTH)/extensions/extensions.gyp:extensions_common',

'sources': [