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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 423533003: Use PageManager in About page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix settings app browser test Created 6 years, 4 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/help/channel_change_page.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 </outputs> 8 </outputs>
9 <release seq="1"> 9 <release seq="1">
10 <structures> 10 <structures>
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 <if expr="enable_extensions"> 43 <if expr="enable_extensions">
44 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensi ons.html" flattenhtml="true" type="chrome_html" /> 44 <structure name="IDR_EXTENSIONS_HTML" file="resources\extensions\extensi ons.html" flattenhtml="true" type="chrome_html" />
45 </if> 45 </if>
46 <if expr="chromeos"> 46 <if expr="chromeos">
47 <structure name="IDR_FIRST_RUN_HTML" file="resources\chromeos\first_run\ first_run.html" flattenhtml="true" type="chrome_html"/> 47 <structure name="IDR_FIRST_RUN_HTML" file="resources\chromeos\first_run\ first_run.html" flattenhtml="true" type="chrome_html"/>
48 <structure name="IDR_FIRST_RUN_JS" file="resources\chromeos\first_run\fi rst_run.js" flattenhtml="true" type="chrome_html" /> 48 <structure name="IDR_FIRST_RUN_JS" file="resources\chromeos\first_run\fi rst_run.js" flattenhtml="true" type="chrome_html" />
49 </if> 49 </if>
50 <if expr="not is_android"> 50 <if expr="not is_android">
51 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtm l="true" type="chrome_html" /> 51 <structure name="IDR_HELP_CSS" file="resources\help\help.css" flattenhtm l="true" type="chrome_html" />
52 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenh tml="true" type="chrome_html" /> 52 <structure name="IDR_HELP_HTML" file="resources\help\help.html" flattenh tml="true" type="chrome_html" />
53 <structure name="IDR_HELP_CONTENT_CSS" file="resources\help\help_content .css" flattenhtml="true" type="chrome_html" />
54 <structure name="IDR_HELP_CONTENT_HTML" file="resources\help\help_conten t.html" flattenhtml="true" type="chrome_html" />
55 <structure name="IDR_HELP_PAGE_HTML" file="resources\help\help_page.html " flattenhtml="true" type="chrome_html" />
53 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_CSS" file="resources\help\ channel_change_page.css" flattenhtml="true" type="chrome_html" /> 56 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_CSS" file="resources\help\ channel_change_page.css" flattenhtml="true" type="chrome_html" />
54 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_HTML" file="resources\help \channel_change_page.html" flattenhtml="true" type="chrome_html" /> 57 <structure name="IDR_HELP_CHANNEL_CHANGE_PAGE_HTML" file="resources\help \channel_change_page.html" flattenhtml="true" type="chrome_html" />
55 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\ntp4\incognito_ tab.html" flattenhtml="true" type="chrome_html" /> 58 <structure name="IDR_INCOGNITO_TAB_HTML" file="resources\ntp4\incognito_ tab.html" flattenhtml="true" type="chrome_html" />
56 <structure name="IDR_GUEST_TAB_HTML" file="resources\ntp4\guest_tab.html " flattenhtml="true" type="chrome_html" /> 59 <structure name="IDR_GUEST_TAB_HTML" file="resources\ntp4\guest_tab.html " flattenhtml="true" type="chrome_html" />
57 </if> 60 </if>
58 <if expr="chromeos"> 61 <if expr="chromeos">
59 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variable s="true"/> 62 <structure name="IDR_LOGIN_HTML" file="resources\chromeos\login\login.ht ml" flattenhtml="true" type="chrome_html" variables="OOBE=login" expand_variable s="true"/>
60 <structure name="IDR_LOGIN_JS" file="resources\chromeos\login\login.js" flattenhtml="true" type="chrome_html" /> 63 <structure name="IDR_LOGIN_JS" file="resources\chromeos\login\login.js" flattenhtml="true" type="chrome_html" />
61 </if> 64 </if>
62 <if expr="not is_android"> 65 <if expr="not is_android">
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" /> 152 <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.js on" type="BINDATA" />
150 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 153 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
151 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" /> 154 <include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
152 <if expr="_google_chrome or enable_hangout_services_extension"> 155 <if expr="_google_chrome or enable_hangout_services_extension">
153 <!-- Hangout Services extension, included in Google Chrome builds only. --> 156 <!-- Hangout Services extension, included in Google Chrome builds only. -->
154 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" /> 157 <include name="IDR_HANGOUT_SERVICES_MANIFEST" file="resources\hangout_se rvices\manifest.json" type="BINDATA" />
155 </if> 158 </if>
156 <include name="IDR_HOTWORD_HELPER_MANIFEST" file="resources\hotword_helper \manifest.json" type="BINDATA" /> 159 <include name="IDR_HOTWORD_HELPER_MANIFEST" file="resources\hotword_helper \manifest.json" type="BINDATA" />
157 <if expr="not is_android"> 160 <if expr="not is_android">
158 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" /> 161 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="t rue" type="BINDATA" />
159 <include name="IDR_HELP_FOCUS_MANAGER_JS" file="resources\help\help_focu s_manager.js" flattenhtml="true" type="BINDATA" /> 162 <include name="IDR_HELP_PAGE_JS" file="resources\help\help_page.js" flat tenhtml="true" type="BINDATA" />
160 <include name="IDR_HELP_BASE_PAGE_JS" file="resources\help\help_base_pag e.js" flattenhtml="true" type="BINDATA" />
161 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" /> 163 <include name="IDR_CHANNEL_CHANGE_PAGE_JS" file="resources\help\channel_ change_page.js" flattenhtml="true" type="BINDATA" />
162 </if> 164 </if>
163 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 165 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
164 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 166 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" />
165 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" /> 167 <include name="IDR_OTHER_DEVICES_JS" file="resources\history\other_devices .js" flattenhtml="true" type="BINDATA" />
166 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" /> 168 <include name="IDR_IDENTITY_API_SCOPE_APPROVAL_MANIFEST" file="resources\i dentity_scope_approval_dialog\manifest.json" type="BINDATA" />
167 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 169 <include name="IDR_INLINE_LOGIN_HTML" file="resources\inline_login\inline_ login.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
168 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" /> 170 <include name="IDR_INLINE_LOGIN_CSS" file="resources\inline_login\inline_l ogin.css" flattenhtml="true" type="BINDATA" />
169 <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_lo gin.js" flattenhtml="true" type="BINDATA" /> 171 <include name="IDR_INLINE_LOGIN_JS" file="resources\inline_login\inline_lo gin.js" flattenhtml="true" type="BINDATA" />
170 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" /> 172 <include name="IDR_INSPECT_CSS" file="resources\inspect\inspect.css" flatt enhtml="true" type="BINDATA" />
(...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" /> 434 <include name="IDR_ZHUYIN_MANIFEST" file="resources\chromeos\input_met hod\zhuyin_manifest.json" type="BINDATA" />
433 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" /> 435 <include name="IDR_CANGJIE_MANIFEST" file="resources\chromeos\input_me thod\cangjie_manifest.json" type="BINDATA" />
434 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" /> 436 <include name="IDR_MOZC_MANIFEST" file="resources\chromeos\input_metho d\mozc_manifest.json" type="BINDATA" />
435 </if> 437 </if>
436 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" /> 438 <include name="IDR_HANGUL_MANIFEST" file="resources\chromeos\input_metho d\hangul_manifest.json" type="BINDATA" />
437 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" /> 439 <include name="IDR_BRAILLE_MANIFEST" file="resources\chromeos\braille_im e\manifest.json" type="BINDATA" />
438 </if> 440 </if>
439 </includes> 441 </includes>
440 </release> 442 </release>
441 </grit> 443 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/help/channel_change_page.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698