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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 6661024: Use a specialized new tab page in TOUCH_UI builds (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix some indentation issues and enable gjslist --strict mode to catch them automatically Created 9 years, 9 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 | « no previous file | chrome/browser/resources/touch_ntp/eventtracker.js » ('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 <!-- This comment is only here because changes to resources are not picked up 2 <!-- This comment is only here because changes to resources are not picked up
3 without changes to the corresponding grd file. etaa --> 3 without changes to the corresponding grd file. etaa -->
4 <grit latest_public_release="0" current_release="1"> 4 <grit latest_public_release="0" current_release="1">
5 <outputs> 5 <outputs>
6 <output filename="grit/browser_resources.h" type="rc_header"> 6 <output filename="grit/browser_resources.h" type="rc_header">
7 <emit emit_type='prepend'></emit> 7 <emit emit_type='prepend'></emit>
8 </output> 8 </output>
9 <output filename="browser_resources.pak" type="data_package" /> 9 <output filename="browser_resources.pak" type="data_package" />
10 <output filename="browser_resources.rc" type="rc_all" /> 10 <output filename="browser_resources.rc" type="rc_all" />
(...skipping 30 matching lines...) Expand all
41 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 41 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
42 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" type="BINDATA" /> 42 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals.html" flattenhtml="true" type="BINDATA" />
43 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" type="BINDATA" /> 43 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" type="BINDATA" />
44 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" /> 44 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" />
45 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> 45 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
46 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" /> 46 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" />
47 <include name="IDR_LOGIN_HTML" file="resources\login.html" flattenhtml="tr ue" type="BINDATA" /> 47 <include name="IDR_LOGIN_HTML" file="resources\login.html" flattenhtml="tr ue" type="BINDATA" />
48 <include name="IDR_LOGIN_CONTAINER_HTML" file="resources\login_container.h tml" flattenhtml="true" type="BINDATA" /> 48 <include name="IDR_LOGIN_CONTAINER_HTML" file="resources\login_container.h tml" flattenhtml="true" type="BINDATA" />
49 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list. json" type="BINDATA" /> 49 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list. json" type="BINDATA" />
50 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> 50 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />
51 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" /> 51 <if expr="not pp_ifdef('touchui')">
52 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f lattenhtml="true" type="BINDATA" /> 52 <include name="IDR_NEW_TAB_HTML" file="resources\new_new_tab.html" flatt enhtml="true" type="BINDATA" />
53 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" flattenhtml="true" type="BINDATA" />
54 </if>
55 <if expr="pp_ifdef('touchui')">
56 <include name="IDR_NEW_TAB_HTML" file="resources\touch_ntp\newtab.html" flattenhtml="true" type="BINDATA" />
57 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\touch_ntp\newtab.c ss" flattenhtml="true" type="BINDATA" />
58 </if>
59 <include name="IDR_TOUCH_NEW_TAB_HTML" file="resources\touch_ntp\newtab.ht ml" flattenhtml="true" type="BINDATA" />
53 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" /> 60 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />
54 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" /> 61 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />
55 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 62 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
56 <include name="IDR_OPTIONS_HTML" file="resources\options\options.html" fla ttenhtml="true" type="BINDATA" /> 63 <include name="IDR_OPTIONS_HTML" file="resources\options\options.html" fla ttenhtml="true" type="BINDATA" />
57 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" type="BINDATA" /> 64 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" type="BINDATA" />
58 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" /> 65 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" />
59 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview.html" flattenhtml="true" type="BINDATA" /> 66 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview.html" flattenhtml="true" type="BINDATA" />
60 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 67 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
61 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 68 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
62 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> 69 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 <!-- manifest file of ChromeVox accessibility extension --> 115 <!-- manifest file of ChromeVox accessibility extension -->
109 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\ manifest.json" type="BINDATA" /> 116 <include name="IDR_CHROMEVOX_MANIFEST" file="resources\access_chromevox\ manifest.json" type="BINDATA" />
110 </if> 117 </if>
111 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 118 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
112 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 119 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
113 <include name="IDR_GETSTARTED_MANIFEST" file="resources\getstarted\manif est.json" type="BINDATA" /> 120 <include name="IDR_GETSTARTED_MANIFEST" file="resources\getstarted\manif est.json" type="BINDATA" />
114 </if> 121 </if>
115 </includes> 122 </includes>
116 </release> 123 </release>
117 </grit> 124 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/touch_ntp/eventtracker.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698