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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8511055: Remove old history UI, and replace with history2. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Suppress bidichecker test failure. Created 9 years, 1 month 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/history.html » ('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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 <if expr="not is_macosx"> 57 <if expr="not is_macosx">
58 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 58 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
59 </if> 59 </if>
60 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 60 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
61 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" /> 61 <include name="IDR_FLAGS_HTML_WARNING" file="resources\flags_warning.html" flattenhtml="true" type="BINDATA" />
62 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 62 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
63 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 63 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
64 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\ software_rendering_list.json" type="BINDATA" /> 64 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\ software_rendering_list.json" type="BINDATA" />
65 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 65 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
66 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" /> 66 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" />
67 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" />
68 <include name="IDR_HISTORY2_JS" file="resources\history2.js" type="BINDATA " />
69 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 67 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
70 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" /> 68 <include name="IDR_HISTORY_JS" file="resources\history.js" type="BINDATA" />
71 <include name="IDR_HUNG_RENDERER_DIALOG_CSS" file="resources\hung_renderer _dialog.css" type="BINDATA" /> 69 <include name="IDR_HUNG_RENDERER_DIALOG_CSS" file="resources\hung_renderer _dialog.css" type="BINDATA" />
72 <include name="IDR_HUNG_RENDERER_DIALOG_HTML" file="resources\hung_rendere r_dialog.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 70 <include name="IDR_HUNG_RENDERER_DIALOG_HTML" file="resources\hung_rendere r_dialog.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
73 <include name="IDR_HUNG_RENDERER_DIALOG_JS" file="resources\hung_renderer_ dialog.js" type="BINDATA" /> 71 <include name="IDR_HUNG_RENDERER_DIALOG_JS" file="resources\hung_renderer_ dialog.js" type="BINDATA" />
74 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> 72 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
75 <include name="IDR_INPUT_WINDOW_DIALOG_HTML" file="resources\input_window_ dialog.html" flattenhtml="true" type="BINDATA" /> 73 <include name="IDR_INPUT_WINDOW_DIALOG_HTML" file="resources\input_window_ dialog.html" flattenhtml="true" type="BINDATA" />
76 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" /> 74 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" />
77 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 75 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
78 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" /> 76 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" />
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 </if> 162 </if>
165 <if expr="pp_ifdef('use_aura')"> 163 <if expr="pp_ifdef('use_aura')">
166 <include name="IDR_APP_LIST_HTML" file="resources\aura\app_list\app_list .html" flattenhtml="true" type="BINDATA" /> 164 <include name="IDR_APP_LIST_HTML" file="resources\aura\app_list\app_list .html" flattenhtml="true" type="BINDATA" />
167 </if> 165 </if>
168 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 166 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
169 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 167 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
170 </if> 168 </if>
171 </includes> 169 </includes>
172 </release> 170 </release>
173 </grit> 171 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/history.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698