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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2781005: Option dialog DOM UI - ChromeOS System page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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/chromeos/dom_ui/system_options_handler.h » ('j') | chrome/browser/dom_ui/options_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 <!-- 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. tiiittttrrr --> 3 without changes to the corresponding grd file. tiiittttrrr -->
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.rc" type="rc_all" /> 9 <output filename="browser_resources.rc" type="rc_all" />
10 <output filename="browser_resources.pak" type="data_package" /> 10 <output filename="browser_resources.pak" type="data_package" />
(...skipping 20 matching lines...) Expand all
31 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" /> 31 <include name="IDR_NEW_NEW_TAB_HTML" file="resources\new_new_tab.html" fla ttenhtml="true" type="BINDATA" />
32 <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type= "BINDATA" /> 32 <include name="IDR_NEW_NEW_TAB_CSS" file="resources\new_new_tab.css" type= "BINDATA" />
33 <include name="IDR_NEW_NEW_TAB_JS" file="resources\new_new_tab.js" type="B INDATA" /> 33 <include name="IDR_NEW_NEW_TAB_JS" file="resources\new_new_tab.js" type="B INDATA" />
34 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 34 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
35 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> 35 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />
36 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 36 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
37 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" /> 37 <include name="IDR_INCOGNITO_TAB_HTML" file="resources\incognito_tab.html" flattenhtml="true" type="BINDATA" />
38 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" /> 38 <include name="IDR_CREDITS_HTML" file="resources\about_credits.html" flatt enhtml="true" type="BINDATA" />
39 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" type="BINDATA" /> 39 <include name="IDR_HISTORY_HTML" file="resources\history.html" flattenhtml ="true" type="BINDATA" />
40 <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')"> 40 <if expr="pp_ifdef('chromeos') or pp_ifdef('toolkit_views')">
41 <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" flattenht ml="true" type="BINDATA" /> 41 <include name="IDR_FILEBROWSE_HTML" file="resources\filebrowse.html" fla ttenhtml="true" type="BINDATA" />
42 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.html" fla ttenhtml="true" type="BINDATA" /> 42 <include name="IDR_OS_CREDITS_HTML" file="resources\about_os_credits.htm l" flattenhtml="true" type="BINDATA" />
43 <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" flatten html="true" type="BINDATA" /> 43 <include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" f lattenhtml="true" type="BINDATA" />
44 <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.html" fl attenhtml="true" type="BINDATA" /> 44 <include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.ht ml" flattenhtml="true" type="BINDATA" />
45 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml ="true" type="BINDATA" /> 45 <include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flatt enhtml="true" type="BINDATA" />
46 <include name="IDR_OPTIONS_HTML" file="resources\options.html" flattenht ml="true" type="BINDATA" />
46 </if> 47 </if>
47 <include name="IDR_APP_GALLERY_ICON" file="resources\app_gallery_icon.png" type="BINDATA" /> 48 <include name="IDR_APP_GALLERY_ICON" file="resources\app_gallery_icon.png" type="BINDATA" />
48 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" /> 49 <include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\ma nifest.json" type="BINDATA" />
49 <include name="IDR_GMAIL_APP_MANIFEST" file="resources\gmail_app\manifest. json" type="BINDATA" /> 50 <include name="IDR_GMAIL_APP_MANIFEST" file="resources\gmail_app\manifest. json" type="BINDATA" />
50 <include name="IDR_CALENDAR_APP_MANIFEST" file="resources\calendar_app\man ifest.json" type="BINDATA" /> 51 <include name="IDR_CALENDAR_APP_MANIFEST" file="resources\calendar_app\man ifest.json" type="BINDATA" />
51 <include name="IDR_DOCS_APP_MANIFEST" file="resources\docs_app\manifest.js on" type="BINDATA" /> 52 <include name="IDR_DOCS_APP_MANIFEST" file="resources\docs_app\manifest.js on" type="BINDATA" />
52 <include name="IDR_CHAT_MANAGER_MANIFEST" file="resources\chat_manager\man ifest.json" type="BINDATA" /> 53 <include name="IDR_CHAT_MANAGER_MANIFEST" file="resources\chat_manager\man ifest.json" type="BINDATA" />
53 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" type="BINDATA" /> 54 <include name="IDR_DOWNLOADS_HTML" file="resources\downloads.html" flatten html="true" type="BINDATA" />
54 <include name="IDR_LOCAL_STRINGS_JS" file="resources\shared\js\local_strin gs.js" type="BINDATA" /> 55 <include name="IDR_LOCAL_STRINGS_JS" file="resources\shared\js\local_strin gs.js" type="BINDATA" />
55 <include name="IDR_DOM_UI_CSS" file="resources\dom_ui.css" flattenhtml="tr ue" type="BINDATA" /> 56 <include name="IDR_DOM_UI_CSS" file="resources\dom_ui.css" flattenhtml="tr ue" type="BINDATA" />
56 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" /> 57 <include name="IDR_EXTENSIONS_UI_HTML" file="resources\extensions_ui.html" flattenhtml="true" type="BINDATA" />
57 <include name="IDR_EXTENSION_DEFAULT_ICON" file="resources\extension_defau lt_icon.png" type="BINDATA" /> 58 <include name="IDR_EXTENSION_DEFAULT_ICON" file="resources\extension_defau lt_icon.png" type="BINDATA" />
58 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_info bar.css" flattenhtml="true" type="BINDATA" /> 59 <include name="IDR_EXTENSIONS_INFOBAR_CSS" file="resources\extensions_info bar.css" flattenhtml="true" type="BINDATA" />
59 <include name="IDR_EXTENSIONS_TOOLSTRIP_THEME_CSS" file="resources\extensi ons_toolstrip.css" flattenhtml="true" type="BINDATA" /> 60 <include name="IDR_EXTENSIONS_TOOLSTRIP_THEME_CSS" file="resources\extensi ons_toolstrip.css" flattenhtml="true" type="BINDATA" />
60 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" type="BINDATA" /> 61 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" type="BINDATA" />
61 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" /> 62 <include name="IDR_ABOUT_SYNC_HTML" file="sync\resources\about_sync.html" flattenhtml="true" type="BINDATA" />
62 <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" />
63 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" /> 64 <include name="IDR_SYNC_SETUP_FLOW_HTML" file="sync\resources\setup_flow.h tml" flattenhtml="true" type="BINDATA" />
64 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" /> 65 <include name="IDR_SYNC_SETUP_DONE_HTML" file="sync\resources\setup_done.h tml" flattenhtml="true" type="BINDATA" />
65 <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block .html" flattenhtml="true" type="BINDATA" /> 66 <include name="IDR_BLACKLIST_HTML" file="resources\privacy_blacklist_block .html" flattenhtml="true" type="BINDATA" />
66 <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_bloc k.png" type="BINDATA" /> 67 <include name="IDR_BLACKLIST_IMAGE" file="resources\privacy_blacklist_bloc k.png" type="BINDATA" />
67 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 68 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
68 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" type="BINDATA" /> 69 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" type="BINDATA" />
69 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" type="BINDATA" /> 70 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" type="BINDATA" />
70 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" /> 71 <include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDA TA" />
71 </includes> 72 </includes>
72 </release> 73 </release>
73 </grit> 74 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/dom_ui/system_options_handler.h » ('j') | chrome/browser/dom_ui/options_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698