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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7976025: Revert 102113 - Aura: Use extension-based file picker from CrOS for pure-views builds. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 3 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 | « build/common.gypi ('k') | chrome/browser/chromeos/preferences.cc » ('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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm l" flattenhtml="true" type="BINDATA" /> 142 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm l" flattenhtml="true" type="BINDATA" />
143 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" /> 143 <include name="IDR_PROXY_SETTINGS_HTML" file="resources\chromeos\proxy_s ettings.html" flattenhtml="true" type="BINDATA" />
144 <include name="IDR_REPOST_FORM_WARNING_HTML" file="resources\repost_form _warning.html" flattenhtml="true" type="BINDATA" /> 144 <include name="IDR_REPOST_FORM_WARNING_HTML" file="resources\repost_form _warning.html" flattenhtml="true" type="BINDATA" />
145 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" /> 145 <include name="IDR_SIM_UNLOCK_HTML" file="resources\chromeos\sim_unlock. html" flattenhtml="true" type="BINDATA" />
146 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" /> 146 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" />
147 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" /> 147 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" />
148 <!-- manifest file of ChromeVox accessibility extension --> 148 <!-- manifest file of ChromeVox accessibility extension -->
149 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\ manifest.json" type="BINDATA" /> 149 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\ manifest.json" type="BINDATA" />
150 <!-- Enterprise enrollment dialog --> 150 <!-- Enterprise enrollment dialog -->
151 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" /> 151 <include name="IDR_ENTERPRISE_ENROLLMENT_HTML" file="policy\resources\en rollment.html" flattenhtml="true" type="BINDATA" />
152 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
152 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" /> 153 <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifes t.json" type="BINDATA" />
153 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" /> 154 <include name="IDR_GAIA_TEST_AUTH_MANIFEST" file="resources\gaia_auth\ma nifest_test.json" type="BINDATA" />
154 </if> 155 </if>
155 <if expr="pp_ifdef('file_manager_extension')">
156 <include name="IDR_FILEMANAGER_MANIFEST" file="resources\file_manager\ma nifest.json" type="BINDATA" />
157 </if>
158 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 156 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
159 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 157 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
160 </if> 158 </if>
161 </includes> 159 </includes>
162 </release> 160 </release>
163 </grit> 161 </grit>
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698