Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1180)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/browser_resources.grd

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved conflicts. Created 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/extensions/media_player_event_router.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/browser_resources.h" type="rc_header"> 4 <output filename="grit/browser_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="browser_resources.pak" type="data_package" /> 7 <output filename="browser_resources.pak" type="data_package" />
8 <output filename="browser_resources.rc" type="rc_all" /> 8 <output filename="browser_resources.rc" type="rc_all" />
9 </outputs> 9 </outputs>
10 <release seq="1"> 10 <release seq="1">
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" /> 88 <include name="IDR_COLLECTED_COOKIES_HTML" file="resources\collected_coo kies.html" flattenhtml="true" type="BINDATA" />
89 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\guest_session _tab.html" flattenhtml="true" type="BINDATA" /> 89 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\guest_session _tab.html" flattenhtml="true" type="BINDATA" />
90 <include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\active_downloa ds.html" flattenhtml="true" type="BINDATA" /> 90 <include name="IDR_ACTIVE_DOWNLOADS_HTML" file="resources\active_downloa ds.html" flattenhtml="true" type="BINDATA" />
91 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_reg istration_page.html" flattenhtml="true" type="BINDATA" /> 91 <include name="IDR_HOST_REGISTRATION_PAGE_HTML" file="resources\host_reg istration_page.html" flattenhtml="true" type="BINDATA" />
92 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 92 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
93 <include name="IDR_IMAGEBURNER_HTML" file="resources\imageburner.html" f lattenhtml="true" type="BINDATA" /> 93 <include name="IDR_IMAGEBURNER_HTML" file="resources\imageburner.html" f lattenhtml="true" type="BINDATA" />
94 <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\keyboard_overla y.css" flattenhtml="true" type="BINDATA" /> 94 <include name="IDR_KEYBOARD_OVERLAY_CSS" file="resources\keyboard_overla y.css" flattenhtml="true" type="BINDATA" />
95 <include name="IDR_KEYBOARD_OVERLAY_DATA_JS" file="resources\keyboard_ov erlay_data.js" flattenhtml="true" type="BINDATA" /> 95 <include name="IDR_KEYBOARD_OVERLAY_DATA_JS" file="resources\keyboard_ov erlay_data.js" flattenhtml="true" type="BINDATA" />
96 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\keyboard_overl ay.html" flattenhtml="true" type="BINDATA" /> 96 <include name="IDR_KEYBOARD_OVERLAY_HTML" file="resources\keyboard_overl ay.html" flattenhtml="true" type="BINDATA" />
97 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\keyboard_overlay .js" flattenhtml="true" type="BINDATA" /> 97 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\keyboard_overlay .js" flattenhtml="true" type="BINDATA" />
98 <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" f lattenhtml="true" type="BINDATA" />
99 <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.ht ml" flattenhtml="true" type="BINDATA" />
100 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\mobile_setup. html" flattenhtml="true" type="BINDATA" /> 98 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\mobile_setup. html" flattenhtml="true" type="BINDATA" />
101 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\notifica tion_icon_link.html" type="BINDATA" /> 99 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\notifica tion_icon_link.html" type="BINDATA" />
102 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html" flattenhtml="true" type="BINDATA" /> 100 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\offline_load.html" flattenhtml="true" type="BINDATA" />
103 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm l" flattenhtml="true" type="BINDATA" /> 101 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm l" flattenhtml="true" type="BINDATA" />
104 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> 102 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" />
105 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> 103 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" />
106 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" /> 104 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" />
107 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" /> 105 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" />
108 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" /> 106 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" />
109 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" /> 107 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" />
110 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" /> 108 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" />
111 <include name="IDR_MOBILE_MANIFEST" file="resources\mobile_app\manifest. json" type="BINDATA" /> 109 <include name="IDR_MOBILE_MANIFEST" file="resources\mobile_app\manifest. json" type="BINDATA" />
112 <!-- manifest file of ChromeVox accessibility extension --> 110 <!-- manifest file of ChromeVox accessibility extension -->
113 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\ manifest.json" type="BINDATA" /> 111 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\ manifest.json" type="BINDATA" />
114 <!-- Enterprise enrollment dialog --> 112 <!-- Enterprise enrollment dialog -->
115 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" /> 113 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" />
116 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 114 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
117 </if> 115 </if>
118 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 116 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
119 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 117 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
120 </if> 118 </if>
121 </includes> 119 </includes>
122 </release> 120 </release>
123 </grit> 121 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chromeos/extensions/media_player_event_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698