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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 4215005: Revert 64246 (reviewer's veto) - Use special text for Guest Session instead o... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/dom_ui/ntp_resource_cache.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 <!-- 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. ete --> 3 without changes to the corresponding grd file. ete -->
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 16 matching lines...) Expand all
27 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" /> 27 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />
28 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" type="BINDATA" /> 28 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" type="BINDATA" />
29 <if expr="os == 'darwin'"> 29 <if expr="os == 'darwin'">
30 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" /> 30 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar_mac.css" flattenhtml="true" type="BINDATA" />
31 </if> 31 </if>
32 <if expr="os != 'darwin'"> 32 <if expr="os != 'darwin'">
33 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" /> 33 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_in fobar.css" flattenhtml="true" type="BINDATA" />
34 </if> 34 </if>
35 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> 35 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" />
36 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" /> 36 <include name="IDR_GAIA_LOGIN_HTML" file="sync\resources\gaia_login.html" flattenhtml="true" type="BINDATA" />
37 <include name="IDR_GUEST_SESSION_TAB_HTML" file="resources\guest_session_t ab.html" flattenhtml="true" type="BINDATA" />
38 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" type="BINDATA" /> 37 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" type="BINDATA" />
39 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" /> 38 <include name="IDR_HISTORY2_HTML" file="resources\history2.html" flattenht ml="true" type="BINDATA" />
40 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> 39 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
41 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" /> 40 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" />
42 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" /> 41 <include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="tr ue" type="BINDATA" />
43 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> 42 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />
44 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" /> 43 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" />
45 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f lattenhtml="true" type="BINDATA" /> 44 <include name="IDR_NEW_TAB_THEME_CSS" file="resources\new_tab_theme.css" f lattenhtml="true" type="BINDATA" />
46 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" /> 45 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />
47 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" /> 46 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif est.json" type="BINDATA" /> 81 <include name="IDR_TALK_APP_MANIFEST" file="resources\chat_manager\manif est.json" type="BINDATA" />
83 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" /> 82 <include name="IDR_MENU_HTML" file="resources\menu.html" flattenhtml="tr ue" type="BINDATA" />
84 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" /> 83 <include name="IDR_NETWORK_MENU_CSS" file="resources\network_menu.css" f lattenhtml="true" type="BINDATA" />
85 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" /> 84 <include name="IDR_NETWORK_MENU_JS" file="resources\network_menu.js" fla ttenhtml="true" type="BINDATA" />
86 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" /> 85 <include name="IDR_WRENCH_MENU_JS" file="resources\wrench_menu.js" flatt enhtml="true" type="BINDATA" />
87 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" /> 86 <include name="IDR_WRENCH_MENU_CSS" file="resources\wrench_menu.css" fla ttenhtml="true" type="BINDATA" />
88 </if> 87 </if>
89 </includes> 88 </includes>
90 </release> 89 </release>
91 </grit> 90 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/dom_ui/ntp_resource_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698