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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/component_extension_resources.grd

Issue 12316075: Preventing race conditions in Google Now extension (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: arv@ comments. Created 7 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/google_now/background.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. --> 3 without changes to the corresponding grd file. -->
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/component_extension_resources.h" type="rc_header"> 6 <output filename="grit/component_extension_resources.h" type="rc_header">
7 <emit emit_type='prepend'></emit> 7 <emit emit_type='prepend'></emit>
8 </output> 8 </output>
9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" /> 9 <output filename="grit/component_extension_resources_map.cc" type="resource_ file_map_source" />
10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" /> 10 <output filename="grit/component_extension_resources_map.h" type="resource_m ap_header" />
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 <include name="IDR_FILE_MANAGER_IMG_GALLERY_2X_CURSOR_NWSE" file="file_m anager/images/gallery/2x/cursor_nwse.png" type="BINDATA" /> 104 <include name="IDR_FILE_MANAGER_IMG_GALLERY_2X_CURSOR_NWSE" file="file_m anager/images/gallery/2x/cursor_nwse.png" type="BINDATA" />
105 <include name="IDR_FILE_MANAGER_IMG_GALLERY_2X_CURSOR_SWNE" file="file_m anager/images/gallery/2x/cursor_swne.png" type="BINDATA" /> 105 <include name="IDR_FILE_MANAGER_IMG_GALLERY_2X_CURSOR_SWNE" file="file_m anager/images/gallery/2x/cursor_swne.png" type="BINDATA" />
106 <include name="IDR_FILE_MANAGER_IMG_GALLERY_2X_CURSOR_UPDOWN" file="file _manager/images/gallery/2x/cursor_updown.png" type="BINDATA" /> 106 <include name="IDR_FILE_MANAGER_IMG_GALLERY_2X_CURSOR_UPDOWN" file="file _manager/images/gallery/2x/cursor_updown.png" type="BINDATA" />
107 </if> 107 </if>
108 <if expr="pp_ifdef('image_loader_extension')"> 108 <if expr="pp_ifdef('image_loader_extension')">
109 <include name="IDR_IMAGE_LOADER_MAIN_JS" file="image_loader/image_loader .js" type="BINDATA" /> 109 <include name="IDR_IMAGE_LOADER_MAIN_JS" file="image_loader/image_loader .js" type="BINDATA" />
110 <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/client.js" type="BINDATA" /> 110 <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/client.js" type="BINDATA" />
111 </if> 111 </if>
112 <if expr="pp_ifdef('enable_google_now')"> 112 <if expr="pp_ifdef('enable_google_now')">
113 <include name="IDR_GOOGLE_NOW_BACKGROUND_JS" file="google_now/background .js" type="BINDATA" /> 113 <include name="IDR_GOOGLE_NOW_BACKGROUND_JS" file="google_now/background .js" type="BINDATA" />
114 <include name="IDR_GOOGLE_NOW_UTILITY_JS" file="google_now/utility.js" t ype="BINDATA" />
114 </if> 115 </if>
115 <include name="IDR_APPS_DEBUGGER_MAIN" file="apps_debugger/main.html" flat tenhtml="true" allowexternalscript="true" type="BINDATA" /> 116 <include name="IDR_APPS_DEBUGGER_MAIN" file="apps_debugger/main.html" flat tenhtml="true" allowexternalscript="true" type="BINDATA" />
116 <include name="IDR_APPS_DEBUGGER_BACKGROUND_JS" file="apps_debugger/backgr ound.js" flattenhtml="true" type="BINDATA" /> 117 <include name="IDR_APPS_DEBUGGER_BACKGROUND_JS" file="apps_debugger/backgr ound.js" flattenhtml="true" type="BINDATA" />
117 <include name="IDR_APPS_DEBUGGER_MAIN_JS" file="apps_debugger/js/main_scri pts.js" flattenhtml="true" type="BINDATA" /> 118 <include name="IDR_APPS_DEBUGGER_MAIN_JS" file="apps_debugger/js/main_scri pts.js" flattenhtml="true" type="BINDATA" />
118 <include name="IDR_APPS_DEBUGGER_ICON_128" file="apps_debugger/images/dev- icon-128.png" flattenhtml="true" type="BINDATA" /> 119 <include name="IDR_APPS_DEBUGGER_ICON_128" file="apps_debugger/images/dev- icon-128.png" flattenhtml="true" type="BINDATA" />
119 <include name="IDR_APPS_DEBUGGER_ICON_16" file="apps_debugger/images/dev-i con-16.png" flattenhtml="true" type="BINDATA" /> 120 <include name="IDR_APPS_DEBUGGER_ICON_16" file="apps_debugger/images/dev-i con-16.png" flattenhtml="true" type="BINDATA" />
120 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')"> 121 <if expr="pp_ifdef('chromeos') and pp_ifdef('_google_chrome')">
121 <include name="IDR_WALLPAPER_MANAGER_EVENT_JS" file="chromeos/wallpaper_ manager/js/event_page.js" flattenhtml="true" type="BINDATA" /> 122 <include name="IDR_WALLPAPER_MANAGER_EVENT_JS" file="chromeos/wallpaper_ manager/js/event_page.js" flattenhtml="true" type="BINDATA" />
122 <include name="IDR_WALLPAPER_MANAGER_MAIN_JS" file="chromeos/wallpaper_m anager/js/main_scripts.js" flattenhtml="true" type="BINDATA" /> 123 <include name="IDR_WALLPAPER_MANAGER_MAIN_JS" file="chromeos/wallpaper_m anager/js/main_scripts.js" flattenhtml="true" type="BINDATA" />
123 <include name="IDR_WALLPAPER_MANAGER_ICON_128" file="chromeos/wallpaper_ manager/images/icon128.png" type="BINDATA" /> 124 <include name="IDR_WALLPAPER_MANAGER_ICON_128" file="chromeos/wallpaper_ manager/images/icon128.png" type="BINDATA" />
124 </if> 125 </if>
125 <if expr="pp_ifdef('chromeos')"> 126 <if expr="pp_ifdef('chromeos')">
126 <!-- Network status. --> 127 <!-- Network status. -->
127 <include name="IDR_NETWORK_CONFIGURATION_STATUS_HTML" file="chromeos/net work_configuration/status.html" allowexternalscript="true" type="BINDATA" /> 128 <include name="IDR_NETWORK_CONFIGURATION_STATUS_HTML" file="chromeos/net work_configuration/status.html" allowexternalscript="true" type="BINDATA" />
128 <include name="IDR_NETWORK_CONFIGURATION_STATUS_CSS" file="chromeos/netw ork_configuration/css/status.css" type="BINDATA" /> 129 <include name="IDR_NETWORK_CONFIGURATION_STATUS_CSS" file="chromeos/netw ork_configuration/css/status.css" type="BINDATA" />
129 <include name="IDR_NETWORK_CONFIGURATION_NETWORK_STATUS_JS" file="chrome os/network_configuration/js/network_status.js" type="BINDATA" /> 130 <include name="IDR_NETWORK_CONFIGURATION_NETWORK_STATUS_JS" file="chrome os/network_configuration/js/network_status.js" type="BINDATA" />
130 <include name="IDR_NETWORK_CONFIGURATION_MAIN_STATUS_JS" file="chromeos/ network_configuration/js/main_status.js" type="BINDATA" /> 131 <include name="IDR_NETWORK_CONFIGURATION_MAIN_STATUS_JS" file="chromeos/ network_configuration/js/main_status.js" type="BINDATA" />
131 <!-- Network configuration. --> 132 <!-- Network configuration. -->
132 <include name="IDR_NETWORK_CONFIGURATION_CONFIG_HTML" file="chromeos/net work_configuration/config.html" allowexternalscript="true" type="BINDATA" /> 133 <include name="IDR_NETWORK_CONFIGURATION_CONFIG_HTML" file="chromeos/net work_configuration/config.html" allowexternalscript="true" type="BINDATA" />
133 <include name="IDR_NETWORK_CONFIGURATION_CONFIG_CSS" file="chromeos/netw ork_configuration/css/config.css" type="BINDATA" /> 134 <include name="IDR_NETWORK_CONFIGURATION_CONFIG_CSS" file="chromeos/netw ork_configuration/css/config.css" type="BINDATA" />
134 <include name="IDR_NETWORK_CONFIGURATION_NETWORK_CONFIG_JS" file="chrome os/network_configuration/js/network_config.js" type="BINDATA" /> 135 <include name="IDR_NETWORK_CONFIGURATION_NETWORK_CONFIG_JS" file="chrome os/network_configuration/js/network_config.js" type="BINDATA" />
135 <include name="IDR_NETWORK_CONFIGURATION_MAIN_CONFIG_JS" file="chromeos/ network_configuration/js/main_config.js" type="BINDATA" /> 136 <include name="IDR_NETWORK_CONFIGURATION_MAIN_CONFIG_JS" file="chromeos/ network_configuration/js/main_config.js" type="BINDATA" />
136 </if> 137 </if>
137 <if expr="pp_ifdef('enable_settings_app')"> 138 <if expr="pp_ifdef('enable_settings_app')">
138 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" /> 139 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />
139 </if> 140 </if>
140 </includes> 141 </includes>
141 </release> 142 </release>
142 </grit> 143 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/google_now/background.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698