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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8689013: Remove TOUCH_UI specific new tab page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk Created 9 years 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 | « no previous file | chrome/browser/resources/new_tab.css » ('j') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 <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" />
71 <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" />
72 <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" />
73 <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" />
74 <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" />
75 <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" />
76 <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" />
77 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> 77 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />
78 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" /> 78 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" />
79 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" /> 79 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" />
80 <if expr="pp_ifdef('touchui')">
81 <include name="IDR_NEW_TAB_HTML" file="resources\touch_ntp\newtab.html" flattenhtml="true" type="BINDATA" />
82 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\touch_ntp\newtab.c ss" flattenhtml="true" type="BINDATA" />
83 </if>
84 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" /> 80 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />
85 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" /> 81 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />
86 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 82 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
87 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 83 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" />
88 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" /> 84 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" />
89 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ > 85 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ >
90 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 86 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
91 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 87 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
92 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 88 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
93 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" /> 89 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" />
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 </if> 162 </if>
167 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 163 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
168 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 164 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
169 </if> 165 </if>
170 <if expr="pp_ifdef('is_macosx')"> 166 <if expr="pp_ifdef('is_macosx')">
171 <include name="IDR_NACL_SANDBOX_DEFINITION" file="nacl_loader.sb" type=" BINDATA" /> 167 <include name="IDR_NACL_SANDBOX_DEFINITION" file="nacl_loader.sb" type=" BINDATA" />
172 </if> 168 </if>
173 </includes> 169 </includes>
174 </release> 170 </release>
175 </grit> 171 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/new_tab.css » ('j') | chrome/browser/ui/webui/ntp/new_tab_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698