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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9865016: [Chrome OS ECHO] Add cookies permission to extension and change intent disposition to inline (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 8 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/chromeos/offers/main.html » ('j') | chrome/browser/resources/chromeos/offers/manifest.json » ('J')
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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\chromeos\keyboar d_overlay.js" flattenhtml="true" type="BINDATA" /> 164 <include name="IDR_KEYBOARD_OVERLAY_JS" file="resources\chromeos\keyboar d_overlay.js" flattenhtml="true" type="BINDATA" />
165 <include name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.html " flattenhtml="true" type="BINDATA" /> 165 <include name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.html " flattenhtml="true" type="BINDATA" />
166 <include name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\login\ demo_user_login.html" flattenhtml="true" type="BINDATA" /> 166 <include name="IDR_DEMO_USER_LOGIN_HTML" file="resources\chromeos\login\ demo_user_login.html" flattenhtml="true" type="BINDATA" />
167 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" /> 167 <include name="IDR_MENU_HTML" file="resources\chromeos\menu.html" flatte nhtml="true" type="BINDATA" />
168 <include name="IDR_MOBILE_MANIFEST" file="resources\chromeos\mobile_app\ manifest.json" type="BINDATA" /> 168 <include name="IDR_MOBILE_MANIFEST" file="resources\chromeos\mobile_app\ manifest.json" type="BINDATA" />
169 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\chromeos\mobi le_setup.html" flattenhtml="true" type="BINDATA" /> 169 <include name="IDR_MOBILE_SETUP_PAGE_HTML" file="resources\chromeos\mobi le_setup.html" flattenhtml="true" type="BINDATA" />
170 <include name="IDR_NETWORK_MENU_CSS" file="resources\chromeos\network_me nu.css" flattenhtml="true" type="BINDATA" /> 170 <include name="IDR_NETWORK_MENU_CSS" file="resources\chromeos\network_me nu.css" flattenhtml="true" type="BINDATA" />
171 <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_men u.js" flattenhtml="true" type="BINDATA" /> 171 <include name="IDR_NETWORK_MENU_JS" file="resources\chromeos\network_men u.js" flattenhtml="true" type="BINDATA" />
172 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos \notification_icon_link.html" type="BINDATA" /> 172 <include name="IDR_NOTIFICATION_ICON_LINK_HTML" file="resources\chromeos \notification_icon_link.html" type="BINDATA" />
173 <include name="IDR_OFFERS_MANIFEST" file="resources\chromeos\offers\mani fest.json" type="BINDATA" /> 173 <include name="IDR_OFFERS_MANIFEST" file="resources\chromeos\offers\mani fest.json" type="BINDATA" />
174 <include name="IDR_OFFERS_MAIN" file="resources\chromeos\offers\main.htm l" flattenhtml="true" type="BINDATA" />
175 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" /> 174 <include name="IDR_OFFLINE_LOAD_HTML" file="resources\chromeos\offline_l oad.html" flattenhtml="true" type="BINDATA" />
176 <include name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="BINDATA" /> 175 <include name="IDR_OOBE_HTML" file="resources\chromeos\login\oobe.html" flattenhtml="true" type="BINDATA" />
177 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" /> 176 <include name="IDR_OS_CREDITS_HTML" file="resources\chromeos\about_os_cr edits.html" flattenhtml="true" type="BINDATA" />
178 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> 177 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" />
179 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> 178 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" />
180 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" /> 179 <include name="IDR_WRENCH_MENU_CSS" file="resources\chromeos\wrench_menu .css" flattenhtml="true" type="BINDATA" />
181 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" /> 180 <include name="IDR_WRENCH_MENU_JS" file="resources\chromeos\wrench_menu. js" flattenhtml="true" type="BINDATA" />
182 </if> 181 </if>
183 <if expr="pp_ifdef('file_manager_extension')"> 182 <if expr="pp_ifdef('file_manager_extension')">
184 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" /> 183 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
185 </if> 184 </if>
186 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') "> 185 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') ">
187 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 186 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
188 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 187 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
189 </if> 188 </if>
190 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 189 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
191 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 190 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
192 </if> 191 </if>
193 </includes> 192 </includes>
194 </release> 193 </release>
195 </grit> 194 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/offers/main.html » ('j') | chrome/browser/resources/chromeos/offers/manifest.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698