chrome/browser/media_router_resources.grdp - Issue 1133853003: Media Router: Replace sink custom elements with core/paper elements.

Side by Side Diff: chrome/browser/media_router_resources.grdp

Issue 1133853003: Media Router: Replace sink custom elements with core/paper elements. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 7 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 unified diff | Download patch

« no previous file with comments | « no previous file | chrome/browser/resources/media_router/elements/icon/chromecast-icon.png » ('j') | chrome/browser/resources/media_router/elements/media_router_container/media_router_container.html » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <grit-part>	2 <grit-part>

3 <!-- General -->	3 <!-- General -->

4 <include name="IDR_MEDIA_ROUTER_COMMON_CSS" file="resources\media_router\media _router_common.css" type="BINDATA" />	4 <include name="IDR_MEDIA_ROUTER_COMMON_CSS" file="resources\media_router\media _router_common.css" type="BINDATA" />

5 <include name="IDR_MEDIA_ROUTER_CSS" file="resources\media_router\media_router .css" type="BINDATA" />	5 <include name="IDR_MEDIA_ROUTER_CSS" file="resources\media_router\media_router .css" type="BINDATA" />

6 <include name="IDR_MEDIA_ROUTER_DATA_JS" file="resources\media_router\media_ro uter_data.js" type="BINDATA" />	6 <include name="IDR_MEDIA_ROUTER_DATA_JS" file="resources\media_router\media_ro uter_data.js" type="BINDATA" />

7 <include name="IDR_MEDIA_ROUTER_JS" file="resources\media_router\media_router. js" type="BINDATA" />	7 <include name="IDR_MEDIA_ROUTER_JS" file="resources\media_router\media_router. js" type="BINDATA" />

8 <include name="IDR_MEDIA_ROUTER_HTML" file="resources\media_router\media_route r.html" type="BINDATA" />	8 <include name="IDR_MEDIA_ROUTER_HTML" file="resources\media_router\media_route r.html" type="BINDATA" />

9 <include name="IDR_MEDIA_ROUTER_UI_INTERFACE_JS" file="resources\media_router\ media_router_ui_interface.js" type="BINDATA" />	9 <include name="IDR_MEDIA_ROUTER_UI_INTERFACE_JS" file="resources\media_router\ media_router_ui_interface.js" type="BINDATA" />

10	10

11 <!-- Polymer -->	11 <!-- Polymer -->

12 <include name="IDR_CAST_MODE_PICKER_HTML" file="resources\media_router\element s\cast_mode_picker\cast_mode_picker.html" type="BINDATA" />	12 <include name="IDR_CAST_MODE_PICKER_HTML" file="resources\media_router\element s\cast_mode_picker\cast_mode_picker.html" type="BINDATA" />

13 <include name="IDR_CAST_MODE_PICKER_CSS" file="resources\media_router\elements \cast_mode_picker\cast_mode_picker.css" type="BINDATA" />	13 <include name="IDR_CAST_MODE_PICKER_CSS" file="resources\media_router\elements \cast_mode_picker\cast_mode_picker.css" type="BINDATA" />

14 <include name="IDR_CAST_MODE_PICKER_JS" file="resources\media_router\elements\ cast_mode_picker\cast_mode_picker.js" type="BINDATA" />	14 <include name="IDR_CAST_MODE_PICKER_JS" file="resources\media_router\elements\ cast_mode_picker\cast_mode_picker.js" type="BINDATA" />

15 <include name="IDR_DROP_DOWN_BUTTON_HTML" file="resources\media_router\element s\drop_down_button\drop_down_button.html" type="BINDATA" />	15 <include name="IDR_DROP_DOWN_BUTTON_HTML" file="resources\media_router\element s\drop_down_button\drop_down_button.html" type="BINDATA" />

16 <include name="IDR_DROP_DOWN_BUTTON_CSS" file="resources\media_router\elements \drop_down_button\drop_down_button.css" type="BINDATA" />	16 <include name="IDR_DROP_DOWN_BUTTON_CSS" file="resources\media_router\elements \drop_down_button\drop_down_button.css" type="BINDATA" />

17 <include name="IDR_DROP_DOWN_BUTTON_JS" file="resources\media_router\elements\ drop_down_button\drop_down_button.js" type="BINDATA" />	17 <include name="IDR_DROP_DOWN_BUTTON_JS" file="resources\media_router\elements\ drop_down_button\drop_down_button.js" type="BINDATA" />

18 <include name="IDR_ISSUE_BANNER_HTML" file="resources\media_router\elements\is sue_banner\issue_banner.html" type="BINDATA" />	18 <include name="IDR_ISSUE_BANNER_HTML" file="resources\media_router\elements\is sue_banner\issue_banner.html" type="BINDATA" />

19 <include name="IDR_ISSUE_BANNER_JS" file="resources\media_router\elements\issu e_banner\issue_banner.js" type="BINDATA" />	19 <include name="IDR_ISSUE_BANNER_JS" file="resources\media_router\elements\issu e_banner\issue_banner.js" type="BINDATA" />

20 <include name="IDR_ISSUE_BANNER_CSS" file="resources\media_router\elements\iss ue_banner\issue_banner.css" type="BINDATA" />	20 <include name="IDR_ISSUE_BANNER_CSS" file="resources\media_router\elements\iss ue_banner\issue_banner.css" type="BINDATA" />

21 <include name="IDR_MEDIA_ROUTER_CONTAINER_HTML" file="resources\media_router\e lements\media_router_container\media_router_container.html" type="BINDATA" />	21 <include name="IDR_MEDIA_ROUTER_CONTAINER_HTML" file="resources\media_router\e lements\media_router_container\media_router_container.html" type="BINDATA" />

22 <include name="IDR_MEDIA_ROUTER_CONTAINER_CSS" file="resources\media_router\el ements\media_router_container\media_router_container.css" type="BINDATA" />	22 <include name="IDR_MEDIA_ROUTER_CONTAINER_CSS" file="resources\media_router\el ements\media_router_container\media_router_container.css" type="BINDATA" />

23 <include name="IDR_MEDIA_ROUTER_CONTAINER_JS" file="resources\media_router\ele ments\media_router_container\media_router_container.js" type="BINDATA" />	23 <include name="IDR_MEDIA_ROUTER_CONTAINER_JS" file="resources\media_router\ele ments\media_router_container\media_router_container.js" type="BINDATA" />

24 <include name="IDR_MEDIA_ROUTER_SINK_HTML" file="resources\media_router\elemen ts\media_router_sink\media_router_sink.html" type="BINDATA" />

25 <include name="IDR_MEDIA_ROUTER_SINK_JS" file="resources\media_router\elements \media_router_sink\media_router_sink.js" type="BINDATA" />

26 <include name="IDR_MEDIA_ROUTER_SINK_CSS" file="resources\media_router\element s\media_router_sink\media_router_sink.css" type="BINDATA" />

27 <include name="IDR_MEDIA_ROUTER_SINK_PICKER_HTML" file="resources\media_router \elements\media_router_sink_picker\media_router_sink_picker.html" type="BINDATA" />

28 <include name="IDR_MEDIA_ROUTER_SINK_PICKER_JS" file="resources\media_router\e lements\media_router_sink_picker\media_router_sink_picker.js" type="BINDATA" />

29 <include name="IDR_ROUTE_DETAILS_HTML" file="resources\media_router\elements\r oute_details\route_details.html" type="BINDATA" />	24 <include name="IDR_ROUTE_DETAILS_HTML" file="resources\media_router\elements\r oute_details\route_details.html" type="BINDATA" />

30 <include name="IDR_ROUTE_DETAILS_CSS" file="resources\media_router\elements\ro ute_details\route_details.css" type="BINDATA" />	25 <include name="IDR_ROUTE_DETAILS_CSS" file="resources\media_router\elements\ro ute_details\route_details.css" type="BINDATA" />

31 <include name="IDR_ROUTE_DETAILS_JS" file="resources\media_router\elements\rou te_details\route_details.js" type="BINDATA" />	26 <include name="IDR_ROUTE_DETAILS_JS" file="resources\media_router\elements\rou te_details\route_details.js" type="BINDATA" />

32	27

33 <!-- Icons -->	28 <!-- Icons -->

34 <include name="IDR_MEDIA_ROUTER_CHROMECAST_ICON" file="resources\media_router\ elements\icon\chromecast-icon.png" type="BINDATA" />
mark a. foltz 2015/05/09 06:37:37 Does hardware.html have all the icons we need? Does hardware.html have all the icons we need? apacible 2015/05/11 17:59:48 No, the hangouts icon isn't available in any of th Show quoted text On 2015/05/09 06:37:37, mark a. foltz wrote: > Does hardware.html have all the icons we need? No, the hangouts icon isn't available in any of the current iconsets. If it's not available by the time we add showing specific device types, we can make a custom icon to use in <core-icon>. apacible 2015/05/11 18:36:47 Actually, I see "hangout" and "hangout-video" icon Show quoted text On 2015/05/11 17:59:48, apacible wrote: > On 2015/05/09 06:37:37, mark a. foltz wrote: > > Does hardware.html have all the icons we need? > > No, the hangouts icon isn't available in any of the current iconsets. If it's > not available by the time we add showing specific device types, we can make a > custom icon to use in <core-icon>. Actually, I see "hangout" and "hangout-video" icons under communication-icons.html. I'm not sure what that looks like, but I'll check it out when I work on this patch again. The above comment still applies if it's not the icon we're looking for.
35 <include name="IDR_MEDIA_ROUTER_CHROMECAST_2X_ICON" file="resources\media_rout er\elements\icon\chromecast-icon2x.png" type="BINDATA" />
mark a. foltz 2015/05/09 06:37:37 Can you add a patch to chrome/browser/OWNERS to ad Can you add a patch to chrome/browser/OWNERS to add the committers on the team as OWNERS of this file? Alternatively could this file be moved to resources/media_router and a new OWNERS added there? apacible 2015/05/11 17:59:48 I have a patch out for this: https://codereview.ch Show quoted text On 2015/05/09 06:37:37, mark a. foltz wrote: > Can you add a patch to chrome/browser/OWNERS to add the committers on the team > as OWNERS of this file? > > Alternatively could this file be moved to resources/media_router and a new > OWNERS added there? I have a patch out for this: https://codereview.chromium.org/1129993003/ From other .grd/.grdp file locations, it seems common for the .grdp file to stay in the same directory as the .grd file.
36 <include name="IDR_CLOSE_GRAY_ICON" file="resources\media_router\elements\icon \close-gray.png" type="BINDATA" />	29 <include name="IDR_CLOSE_GRAY_ICON" file="resources\media_router\elements\icon \close-gray.png" type="BINDATA" />

37 <include name="IDR_CLOSE_GRAY_2X_ICON" file="resources\media_router\elements\i con\close-gray2x.png" type="BINDATA" />	30 <include name="IDR_CLOSE_GRAY_2X_ICON" file="resources\media_router\elements\i con\close-gray2x.png" type="BINDATA" />

38 <include name="IDR_DROP_DOWN_ARROW_ICON" file="resources\media_router\elements \icon\drop-down-arrow.png" type="BINDATA" />	31 <include name="IDR_DROP_DOWN_ARROW_ICON" file="resources\media_router\elements \icon\drop-down-arrow.png" type="BINDATA" />

39 <include name="IDR_DROP_DOWN_ARROW_2X_ICON" file="resources\media_router\eleme nts\icon\drop-down-arrow2x.png" type="BINDATA" />	32 <include name="IDR_DROP_DOWN_ARROW_2X_ICON" file="resources\media_router\eleme nts\icon\drop-down-arrow2x.png" type="BINDATA" />

40 <include name="IDR_DROP_DOWN_ARROW_HOVER_ICON" file="resources\media_router\el ements\icon\drop-down-arrow-hover.png" type="BINDATA" />	33 <include name="IDR_DROP_DOWN_ARROW_HOVER_ICON" file="resources\media_router\el ements\icon\drop-down-arrow-hover.png" type="BINDATA" />

41 <include name="IDR_DROP_DOWN_ARROW_HOVER_2X_ICON" file="resources\media_router \elements\icon\drop-down-arrow-hover2x.png" type="BINDATA" />	34 <include name="IDR_DROP_DOWN_ARROW_HOVER_2X_ICON" file="resources\media_router \elements\icon\drop-down-arrow-hover2x.png" type="BINDATA" />

42 <include name="IDR_DROP_DOWN_ARROW_SHOWING_ICON" file="resources\media_router\ elements\icon\drop-down-arrow-showing.png" type="BINDATA" />	35 <include name="IDR_DROP_DOWN_ARROW_SHOWING_ICON" file="resources\media_router\ elements\icon\drop-down-arrow-showing.png" type="BINDATA" />

43 <include name="IDR_DROP_DOWN_ARROW_SHOWING_2X_ICON" file="resources\media_rout er\elements\icon\drop-down-arrow-showing2x.png" type="BINDATA" />	36 <include name="IDR_DROP_DOWN_ARROW_SHOWING_2X_ICON" file="resources\media_rout er\elements\icon\drop-down-arrow-showing2x.png" type="BINDATA" />

44 <include name="IDR_MEDIA_ROUTER_GENERIC_DEVICE_ICON" file="resources\media_rou ter\elements\icon\generic-device.png" type="BINDATA" />

45 <include name="IDR_MEDIA_ROUTER_GENERIC_DEVICE_2X_ICON" file="resources\media_ router\elements\icon\generic-device2x.png" type="BINDATA" />

46 <include name="IDR_MEDIA_ROUTER_HANGOUTS_ICON" file="resources\media_router\el ements\icon\hangouts-icon.png" type="BINDATA" />

47 <include name="IDR_MEDIA_ROUTER_HANGOUTS_2X_ICON" file="resources\media_router \elements\icon\hangouts-icon2x.png" type="BINDATA" />

48 <include name="IDR_SAD_FACE_ICON" file="resources\media_router\elements\icon\s ad-face.png" type="BINDATA" />	37 <include name="IDR_SAD_FACE_ICON" file="resources\media_router\elements\icon\s ad-face.png" type="BINDATA" />

49 <include name="IDR_SAD_FACE_2X_ICON" file="resources\media_router\elements\ico n\sad-face2x.png" type="BINDATA" />	38 <include name="IDR_SAD_FACE_2X_ICON" file="resources\media_router\elements\ico n\sad-face2x.png" type="BINDATA" />

50 </grit-part>	39 </grit-part>

OLD	NEW