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

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

Issue 14081014: Identity API: Change WebAuthFlow to use <webview> instead of a normal browser pop-up. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: chrome.identity side-by-side with chrome.experimental.identity Created 7 years, 7 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
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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 <include name="IDR_FILE_MANAGER_IMG_GALLERY_2X_CURSOR_UPDOWN" file="file _manager/images/gallery/2x/cursor_updown.png" type="BINDATA" /> 110 <include name="IDR_FILE_MANAGER_IMG_GALLERY_2X_CURSOR_UPDOWN" file="file _manager/images/gallery/2x/cursor_updown.png" type="BINDATA" />
111 </if> 111 </if>
112 <if expr="pp_ifdef('image_loader_extension')"> 112 <if expr="pp_ifdef('image_loader_extension')">
113 <include name="IDR_IMAGE_LOADER_MAIN_JS" file="image_loader/image_loader .js" type="BINDATA" /> 113 <include name="IDR_IMAGE_LOADER_MAIN_JS" file="image_loader/image_loader .js" type="BINDATA" />
114 <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/client.js" type="BINDATA" /> 114 <include name="IDR_IMAGE_LOADER_CLIENT_JS" file="image_loader/client.js" type="BINDATA" />
115 </if> 115 </if>
116 <if expr="pp_ifdef('enable_google_now')"> 116 <if expr="pp_ifdef('enable_google_now')">
117 <include name="IDR_GOOGLE_NOW_BACKGROUND_JS" file="google_now/background .js" type="BINDATA" /> 117 <include name="IDR_GOOGLE_NOW_BACKGROUND_JS" file="google_now/background .js" type="BINDATA" />
118 <include name="IDR_GOOGLE_NOW_UTILITY_JS" file="google_now/utility.js" t ype="BINDATA" /> 118 <include name="IDR_GOOGLE_NOW_UTILITY_JS" file="google_now/utility.js" t ype="BINDATA" />
119 </if> 119 </if>
120 <include name="IDR_IDENTITY_API_UI_CSS" file="identity_api_ui/identity_api _ui.css" type="BINDATA" />
121 <include name="IDR_IDENTITY_API_UI_JS" file="identity_api_ui/identity_api_ ui.js" type="BINDATA" />
122 <include name="IDR_IDENTITY_API_UI_SCOPE_APPROVAL_DIALOG" file="identity_a pi_ui/scope_approval_dialog.html" type="BINDATA" />
123 <include name="IDR_IDENTITY_API_UI_SCOPE_APPROVAL_DIALOG_JS" file="identit y_api_ui/scope_approval_dialog.js" type="BINDATA" />
120 <include name="IDR_APPS_DEBUGGER_MAIN" file="apps_debugger/main.html" flat tenhtml="true" allowexternalscript="true" type="BINDATA" /> 124 <include name="IDR_APPS_DEBUGGER_MAIN" file="apps_debugger/main.html" flat tenhtml="true" allowexternalscript="true" type="BINDATA" />
121 <include name="IDR_APPS_DEBUGGER_BACKGROUND_JS" file="apps_debugger/backgr ound.js" flattenhtml="true" type="BINDATA" /> 125 <include name="IDR_APPS_DEBUGGER_BACKGROUND_JS" file="apps_debugger/backgr ound.js" flattenhtml="true" type="BINDATA" />
122 <include name="IDR_APPS_DEBUGGER_MAIN_JS" file="apps_debugger/js/main_scri pts.js" flattenhtml="true" type="BINDATA" /> 126 <include name="IDR_APPS_DEBUGGER_MAIN_JS" file="apps_debugger/js/main_scri pts.js" flattenhtml="true" type="BINDATA" />
123 <include name="IDR_APPS_DEBUGGER_ICON_128" file="apps_debugger/images/dev- icon-128.png" flattenhtml="true" type="BINDATA" /> 127 <include name="IDR_APPS_DEBUGGER_ICON_128" file="apps_debugger/images/dev- icon-128.png" flattenhtml="true" type="BINDATA" />
124 <include name="IDR_APPS_DEBUGGER_ICON_16" file="apps_debugger/images/dev-i con-16.png" flattenhtml="true" type="BINDATA" /> 128 <include name="IDR_APPS_DEBUGGER_ICON_16" file="apps_debugger/images/dev-i con-16.png" flattenhtml="true" type="BINDATA" />
125 <if expr="pp_ifdef('chromeos')"> 129 <if expr="pp_ifdef('chromeos')">
126 <include name="IDR_WALLPAPER_MANAGER_CONSTANTS_JS" file="chromeos/wallpa per_manager/js/constants.js" flattenhtml="true" type="BINDATA" /> 130 <include name="IDR_WALLPAPER_MANAGER_CONSTANTS_JS" file="chromeos/wallpa per_manager/js/constants.js" flattenhtml="true" type="BINDATA" />
127 <include name="IDR_WALLPAPER_MANAGER_EVENT_JS" file="chromeos/wallpaper_ manager/js/event_page.js" flattenhtml="true" type="BINDATA" /> 131 <include name="IDR_WALLPAPER_MANAGER_EVENT_JS" file="chromeos/wallpaper_ manager/js/event_page.js" flattenhtml="true" type="BINDATA" />
128 <include name="IDR_WALLPAPER_MANAGER_ICON_128" file="chromeos/wallpaper_ manager/images/icon128.png" type="BINDATA" /> 132 <include name="IDR_WALLPAPER_MANAGER_ICON_128" file="chromeos/wallpaper_ manager/images/icon128.png" type="BINDATA" />
129 <include name="IDR_WALLPAPER_MANAGER_MAIN_JS" file="chromeos/wallpaper_m anager/js/main_scripts.js" flattenhtml="true" type="BINDATA" /> 133 <include name="IDR_WALLPAPER_MANAGER_MAIN_JS" file="chromeos/wallpaper_m anager/js/main_scripts.js" flattenhtml="true" type="BINDATA" />
(...skipping 10 matching lines...) Expand all
140 <include name="IDR_NETWORK_CONFIGURATION_CONFIG_CSS" file="chromeos/netw ork_configuration/css/config.css" type="BINDATA" /> 144 <include name="IDR_NETWORK_CONFIGURATION_CONFIG_CSS" file="chromeos/netw ork_configuration/css/config.css" type="BINDATA" />
141 <include name="IDR_NETWORK_CONFIGURATION_NETWORK_CONFIG_JS" file="chrome os/network_configuration/js/network_config.js" type="BINDATA" /> 145 <include name="IDR_NETWORK_CONFIGURATION_NETWORK_CONFIG_JS" file="chrome os/network_configuration/js/network_config.js" type="BINDATA" />
142 <include name="IDR_NETWORK_CONFIGURATION_MAIN_CONFIG_JS" file="chromeos/ network_configuration/js/main_config.js" type="BINDATA" /> 146 <include name="IDR_NETWORK_CONFIGURATION_MAIN_CONFIG_JS" file="chromeos/ network_configuration/js/main_config.js" type="BINDATA" />
143 </if> 147 </if>
144 <if expr="pp_ifdef('enable_settings_app')"> 148 <if expr="pp_ifdef('enable_settings_app')">
145 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" /> 149 <include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />
146 </if> 150 </if>
147 </includes> 151 </includes>
148 </release> 152 </release>
149 </grit> 153 </grit>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698