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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9610006: Refactoring, moving and renaming the NetworkActionPredictor. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Changing DB to PKS from RefcountedPKS and addressing comments. Created 8 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
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/predictors/OWNERS » ('j') | chrome/browser/predictors/autocomplete_action_predictor.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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" /> 66 <include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="tru e" type="BINDATA" />
67 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\ software_rendering_list.json" type="BINDATA" /> 67 <include name="IDR_GPU_BLACKLIST" file="resources\software_rendering_list\ software_rendering_list.json" type="BINDATA" />
68 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 68 <include name="IDR_GPU_INTERNALS_HTML" file="resources\gpu_internals\gpu_i nternals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
69 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" /> 69 <include name="IDR_GPU_INTERNALS_JS" file="resources\gpu_internals\gpu_int ernals.js" flattenhtml="true" type="BINDATA" />
70 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 70 <include name="IDR_HISTORY_HTML" file="resources\history\history.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
71 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" type="BINDATA" /> 71 <include name="IDR_HISTORY_JS" file="resources\history\history.js" flatten html="true" 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_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" /> 73 <include name="IDR_KEYBOARD_MANIFEST" file="resources\keyboard\manifest.js on" type="BINDATA" />
74 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 74 <include name="IDR_MEDIA_INTERNALS_HTML" file="resources\media_internals.h tml" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
75 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" /> 75 <include name="IDR_MEDIA_INTERNALS_JS" file="resources\media_internals\med ia_internals.js" flattenhtml="true" type="BINDATA" />
76 <include name="IDR_NETWORK_ACTION_PREDICTOR_HTML" file="resources\network_ action_predictor\network_action_predictor.html" flattenhtml="true" allowexternal script="true" type="BINDATA" />
77 <include name="IDR_NETWORK_ACTION_PREDICTOR_JS" file="resources\network_ac tion_predictor\network_action_predictor.js" type="BINDATA" />
78 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" /> 76 <include name="IDR_NEW_INCOGNITO_TAB_THEME_CSS" file="resources\new_incogn ito_tab_theme.css" flattenhtml="true" type="BINDATA" />
79 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" /> 77 <include name="IDR_NEW_TAB_4_HTML" file="resources\ntp4\new_tab.html" flat tenhtml="true" type="BINDATA" />
80 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" /> 78 <include name="IDR_NEW_TAB_4_THEME_CSS" file="resources\ntp4\new_tab_theme .css" flattenhtml="true" type="BINDATA" />
81 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" /> 79 <include name="IDR_NOTIFICATION_1LINE_HTML" file="resources\notification_1 line.html" flattenhtml="true" type="BINDATA" />
82 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" /> 80 <include name="IDR_NOTIFICATION_2LINE_HTML" file="resources\notification_2 line.html" flattenhtml="true" type="BINDATA" />
83 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" /> 81 <include name="IDR_NOTIFICATION_ICON_HTML" file="resources\notification_ic on.html" type="BINDATA" />
84 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" /> 82 <include name="IDR_OMNIBOX_HTML" file="resources\omnibox\omnibox.html" fla ttenhtml="true" allowexternalscript="true" type="BINDATA" />
85 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" /> 83 <include name="IDR_OMNIBOX_CSS" file="resources\omnibox\omnibox.css" type= "BINDATA" />
86 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" /> 84 <include name="IDR_OMNIBOX_JS" file="resources\omnibox\omnibox.js" type="B INDATA" />
87 <include name="IDR_PLUGINS_HTML" file="resources\plugins.html" flattenhtml ="true" allowexternalscript="true" type="BINDATA" /> 85 <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" /> 86 <include name="IDR_PLUGINS_JS" file="resources\plugins.js" type="BINDATA" />
89 <if expr="is_win"> 87 <if expr="is_win">
90 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_win.json" typ e="BINDATA" /> 88 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_win.json" typ e="BINDATA" />
91 </if> 89 </if>
92 <if expr="is_macosx"> 90 <if expr="is_macosx">
93 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_mac.json" typ e="BINDATA" /> 91 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_mac.json" typ e="BINDATA" />
94 </if> 92 </if>
95 <if expr="is_linux"> 93 <if expr="is_linux">
96 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_linux.json" t ype="BINDATA" /> 94 <include name="IDR_PLUGIN_DB_JSON" file="resources\plugins_linux.json" t ype="BINDATA" />
97 </if> 95 </if>
98 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ > 96 <include name="IDR_POLICY_CSS" file="resources\policy.css" type="BINDATA"/ >
99 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/> 97 <include name="IDR_POLICY_HTML" file="resources\policy.html" flattenhtml=" true" allowexternalscript="true" type="BINDATA"/>
100 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/> 98 <include name="IDR_POLICY_JS" file="resources\policy.js" type="BINDATA"/>
99 <include name="IDR_PREDICTORS_HTML" file="resources\predictors\predictors. html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
100 <include name="IDR_PREDICTORS_JS" file="resources\predictors\predictors.js " type="BINDATA" />
101 <include name="IDR_PRINT_PREVIEW_DUMMY_HTML" file="resources\print_preview \print_preview_dummy.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" /> 101 <include name="IDR_PRINT_PREVIEW_DUMMY_HTML" file="resources\print_preview \print_preview_dummy.html" flattenhtml="true" allowexternalscript="true" type="B INDATA" />
102 <include name="IDR_PRINT_PREVIEW_DUMMY_JS" file="resources\print_preview\p rint_preview_dummy.js" flattenhtml="true" type="BINDATA" /> 102 <include name="IDR_PRINT_PREVIEW_DUMMY_JS" file="resources\print_preview\p rint_preview_dummy.js" flattenhtml="true" type="BINDATA" />
103 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 103 <include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print _preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
104 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" /> 104 <include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_p review.js" flattenhtml="true" type="BINDATA" />
105 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> 105 <include name="IDR_PROFILER_HTML" file="resources\profiler\profiler.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
106 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" /> 106 <include name="IDR_PROFILER_JS" file="resources\profiler\profiler.js" flat tenhtml="true" type="BINDATA" />
107 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" /> 107 <include name="IDR_READER_OUT_OF_DATE_HTML" file="resources\reader_out_of_ date.html" flattenhtml="true" type="BINDATA" />
108 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" /> 108 <include name="IDR_SAFE_BROWSING_MALWARE_BLOCK" file="resources\safe_brows ing_malware_block.html" flattenhtml="true" type="BINDATA" />
109 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" /> 109 <include name="IDR_SAFE_BROWSING_MULTIPLE_THREAT_BLOCK" file="resources\sa fe_browsing_multiple_threat_block.html" flattenhtml="true" type="BINDATA" />
110 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" /> 110 <include name="IDR_SAFE_BROWSING_PHISHING_BLOCK" file="resources\safe_brow sing_phishing_block.html" flattenhtml="true" type="BINDATA" />
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') "> 183 <if expr="(is_linux and pp_ifdef('toolkit_views')) or pp_ifdef('use_aura') ">
184 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" /> 184 <include name="IDR_HTTP_AUTH_HTML" file="resources\http_auth.html" flatt enhtml="true" type="BINDATA" />
185 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" /> 185 <include name="IDR_TAB_MODAL_CONFIRM_DIALOG_HTML" file="resources\tab_mo dal_confirm_dialog.html" flattenhtml="true" type="BINDATA" />
186 </if> 186 </if>
187 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 187 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
188 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" /> 188 <include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json " type="BINDATA" />
189 </if> 189 </if>
190 </includes> 190 </includes>
191 </release> 191 </release>
192 </grit> 192 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/browser_about_handler.cc ('k') | chrome/browser/predictors/OWNERS » ('j') | chrome/browser/predictors/autocomplete_action_predictor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698