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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8539022: Bluetooth UI update. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with trunk. Created 9 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/browser/resources/shared/images/spinner.svg ('k') | chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.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. paaaae --> 3 without changes to the corresponding grd file. paaaae -->
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/shared_resources.h" type="rc_header"> 6 <output filename="grit/shared_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/shared_resources_map.cc" type="resource_file_map_sour ce" /> 9 <output filename="grit/shared_resources_map.cc" type="resource_file_map_sour ce" />
10 <output filename="grit/shared_resources_map.h" type="resource_map_header" /> 10 <output filename="grit/shared_resources_map.h" type="resource_map_header" />
(...skipping 10 matching lines...) Expand all
21 <include name="IDR_SHARED_CSS_DIALOGS" 21 <include name="IDR_SHARED_CSS_DIALOGS"
22 file="shared/css/dialogs.css" type="BINDATA" /> 22 file="shared/css/dialogs.css" type="BINDATA" />
23 <include name="IDR_SHARED_CSS_LIST" 23 <include name="IDR_SHARED_CSS_LIST"
24 file="shared/css/list.css" type="BINDATA" /> 24 file="shared/css/list.css" type="BINDATA" />
25 <include name="IDR_SHARED_CSS_MENU" 25 <include name="IDR_SHARED_CSS_MENU"
26 file="shared/css/menu.css" type="BINDATA" /> 26 file="shared/css/menu.css" type="BINDATA" />
27 <include name="IDR_SHARED_CSS_CHROME" 27 <include name="IDR_SHARED_CSS_CHROME"
28 file="shared/css/chrome_shared.css" type="BINDATA" /> 28 file="shared/css/chrome_shared.css" type="BINDATA" />
29 <include name="IDR_SHARED_CSS_SELECT" 29 <include name="IDR_SHARED_CSS_SELECT"
30 file="shared/css/select.css" type="BINDATA" /> 30 file="shared/css/select.css" type="BINDATA" />
31 <include name="IDR_SHARED_CSS_SPINNER"
32 file="shared/css/spinner.css" type="BINDATA" />
31 <include name="IDR_SHARED_CSS_TABLE" 33 <include name="IDR_SHARED_CSS_TABLE"
32 file="shared/css/table.css" type="BINDATA" /> 34 file="shared/css/table.css" type="BINDATA" />
33 <include name="IDR_SHARED_CSS_TABS" 35 <include name="IDR_SHARED_CSS_TABS"
34 file="shared/css/tabs.css" type="BINDATA" /> 36 file="shared/css/tabs.css" type="BINDATA" />
35 <include name="IDR_SHARED_CSS_THROBBER" 37 <include name="IDR_SHARED_CSS_THROBBER"
36 file="shared/css/throbber.css" type="BINDATA" /> 38 file="shared/css/throbber.css" type="BINDATA" />
37 <include name="IDR_SHARED_CSS_TREE" 39 <include name="IDR_SHARED_CSS_TREE"
38 file="shared/css/tree.css" type="BINDATA" /> 40 file="shared/css/tree.css" type="BINDATA" />
39 <include name="IDR_SHARED_CSS_TREE_JS" 41 <include name="IDR_SHARED_CSS_TREE_JS"
40 file="shared/css/tree.css.js" type="BINDATA" /> 42 file="shared/css/tree.css.js" type="BINDATA" />
41 <include name="IDR_SHARED_IMAGES_CHECKMARK" 43 <include name="IDR_SHARED_IMAGES_CHECKMARK"
42 file="shared/images/checkmark.png" type="BINDATA" /> 44 file="shared/images/checkmark.png" type="BINDATA" />
43 <include name="IDR_SHARED_IMAGES_CHECKBOX_BLACK" 45 <include name="IDR_SHARED_IMAGES_CHECKBOX_BLACK"
44 file="shared/images/checkbox_black.png" type="BINDATA" /> 46 file="shared/images/checkbox_black.png" type="BINDATA" />
45 <include name="IDR_SHARED_IMAGES_CHECKBOX_WHITE" 47 <include name="IDR_SHARED_IMAGES_CHECKBOX_WHITE"
46 file="shared/images/checkbox_white.png" type="BINDATA" /> 48 file="shared/images/checkbox_white.png" type="BINDATA" />
47 <include name="IDR_SHARED_IMAGES_DISABLED_SELECT" 49 <include name="IDR_SHARED_IMAGES_DISABLED_SELECT"
48 file="shared/images/disabled_select.png" type="BINDATA" /> 50 file="shared/images/disabled_select.png" type="BINDATA" />
49 <include name="IDR_SHARED_IMAGES_GOOGLE_TRANSPARENT" 51 <include name="IDR_SHARED_IMAGES_GOOGLE_TRANSPARENT"
50 file="shared/images/google-transparent.png" type="BINDATA" /> 52 file="shared/images/google-transparent.png" type="BINDATA" />
51 <include name="IDR_SHARED_IMAGES_SELECT" 53 <include name="IDR_SHARED_IMAGES_SELECT"
52 file="shared/images/select.png" type="BINDATA" /> 54 file="shared/images/select.png" type="BINDATA" />
55 <include name="IDR_SHARED_IMAGES_SPINNER"
56 file="shared/images/spinner.svg" type="BINDATA" />
53 <include name="IDR_SHARED_IMAGES_THROBBER" 57 <include name="IDR_SHARED_IMAGES_THROBBER"
54 file="shared/images/throbber.svg" type="BINDATA" /> 58 file="shared/images/throbber.svg" type="BINDATA" />
55 <include name="IDR_SHARED_JS_CR" 59 <include name="IDR_SHARED_JS_CR"
56 file="shared/js/cr.js" type="BINDATA" /> 60 file="shared/js/cr.js" type="BINDATA" />
57 <include name="IDR_SHARED_JS_CR_COMMAND_LINE" 61 <include name="IDR_SHARED_JS_CR_COMMAND_LINE"
58 file="shared/js/cr/command_line.js" type="BINDATA" /> 62 file="shared/js/cr/command_line.js" type="BINDATA" />
59 <include name="IDR_SHARED_JS_CR_EVENT_TARGET" 63 <include name="IDR_SHARED_JS_CR_EVENT_TARGET"
60 file="shared/js/cr/event_target.js" type="BINDATA" /> 64 file="shared/js/cr/event_target.js" type="BINDATA" />
61 <include name="IDR_SHARED_JS_CR_LINK_CONTROLLER" 65 <include name="IDR_SHARED_JS_CR_LINK_CONTROLLER"
62 file="shared/js/cr/link_controller.js" type="BINDATA" /> 66 file="shared/js/cr/link_controller.js" type="BINDATA" />
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 file="shared/js/local_strings.js" type="BINDATA" /> 139 file="shared/js/local_strings.js" type="BINDATA" />
136 <include name="IDR_SHARED_JS_MEDIA_COMMON" 140 <include name="IDR_SHARED_JS_MEDIA_COMMON"
137 file="shared/js/media_common.js" type="BINDATA" /> 141 file="shared/js/media_common.js" type="BINDATA" />
138 <include name="IDR_SHARED_JS_PARSE_HTML_SUBSET" 142 <include name="IDR_SHARED_JS_PARSE_HTML_SUBSET"
139 file="shared/js/parse_html_subset.js" type="BINDATA" /> 143 file="shared/js/parse_html_subset.js" type="BINDATA" />
140 <include name="IDR_SHARED_JS_UTIL" 144 <include name="IDR_SHARED_JS_UTIL"
141 file="shared/js/util.js" type="BINDATA" /> 145 file="shared/js/util.js" type="BINDATA" />
142 </includes> 146 </includes>
143 </release> 147 </release>
144 </grit> 148 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/shared/images/spinner.svg ('k') | chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698