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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/app/theme/theme_resources.grd

Issue 5056004: Update the icons for the upgrade notification and the conflicts detected page... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 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/app/theme/conflicts.png ('k') | chrome/browser/dom_ui/conflicts_ui.cc » ('j') | chrome/browser/ui/views/toolbar_view.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/theme_resources.h" type="rc_header"> 4 <output filename="grit/theme_resources.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" /> 7 <output filename="grit/theme_resources_map.cc" type="resource_map_source" />
8 <output filename="grit/theme_resources_map.h" type="resource_map_header" /> 8 <output filename="grit/theme_resources_map.h" type="resource_map_header" />
9 <output filename="theme_resources.pak" type="data_package" /> 9 <output filename="theme_resources.pak" type="data_package" />
10 <output filename="theme_resources.rc" type="rc_all" /> 10 <output filename="theme_resources.rc" type="rc_all" />
11 </outputs> 11 </outputs>
12 <release seq="1"> 12 <release seq="1">
13 <includes> 13 <includes>
14 <if expr="pp_ifdef('_google_chrome')"> 14 <if expr="pp_ifdef('_google_chrome')">
15 <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_backgroun d.png" type="BINDATA" /> 15 <include name="IDR_ABOUT_BACKGROUND" file="google_chrome/about_backgroun d.png" type="BINDATA" />
16 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_bac kground_color.png" type="BINDATA" /> 16 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="google_chrome/about_bac kground_color.png" type="BINDATA" />
17 <include name="IDR_ABOUT_BACKGROUND_RTL" file="google_chrome/about_backg round_rtl.png" type="BINDATA" /> 17 <include name="IDR_ABOUT_BACKGROUND_RTL" file="google_chrome/about_backg round_rtl.png" type="BINDATA" />
18 </if> 18 </if>
19 <if expr="not pp_ifdef('_google_chrome')"> 19 <if expr="not pp_ifdef('_google_chrome')">
20 <include name="IDR_ABOUT_BACKGROUND" file="chromium/about_background.png " type="BINDATA" /> 20 <include name="IDR_ABOUT_BACKGROUND" file="chromium/about_background.png " type="BINDATA" />
21 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="chromium/about_backgrou nd_color.png" type="BINDATA" /> 21 <include name="IDR_ABOUT_BACKGROUND_COLOR" file="chromium/about_backgrou nd_color.png" type="BINDATA" />
22 <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background _rtl.png" type="BINDATA" /> 22 <include name="IDR_ABOUT_BACKGROUND_RTL" file="chromium/about_background _rtl.png" type="BINDATA" />
23 </if> 23 </if>
24 <include name="IDR_ACCESSED_COOKIES" file="accessed_cookies.png" type="BIN DATA" /> 24 <include name="IDR_ACCESSED_COOKIES" file="accessed_cookies.png" type="BIN DATA" />
25 <include name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" type="BIN DATA" /> 25 <include name="IDR_APP_DEFAULT_ICON" file="app_default_icon.png" type="BIN DATA" />
26 <include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" /> 26 <include name="IDR_APP_DROPARROW" file="app_droparrow.png" type="BINDATA" />
27 <include name="IDR_BACKGROUND_BADGE" file="background_badge.png" type="BIN DATA" />
28 <include name="IDR_BACKGROUND_MENU" file="background_menu.png" type="BINDA TA" />
27 <include name="IDR_BACK" file="back.png" type="BINDATA" /> 29 <include name="IDR_BACK" file="back.png" type="BINDATA" />
28 <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" /> 30 <include name="IDR_BACK_D" file="back_d.png" type="BINDATA" />
29 <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" /> 31 <include name="IDR_BACK_H" file="back_h.png" type="BINDATA" />
30 <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" /> 32 <include name="IDR_BACK_P" file="back_p.png" type="BINDATA" />
31 <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" /> 33 <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" />
32 <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" typ e="BINDATA" /> 34 <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" typ e="BINDATA" />
33 <include name="IDR_BALLOON_WRENCH" file="notification_wrench.png" type="BI NDATA" /> 35 <include name="IDR_BALLOON_WRENCH" file="notification_wrench.png" type="BI NDATA" />
34 <include name="IDR_BALLOON_WRENCH_H" file="notification_wrench_h.png" type ="BINDATA" /> 36 <include name="IDR_BALLOON_WRENCH_H" file="notification_wrench_h.png" type ="BINDATA" />
35 <include name="IDR_BALLOON_WRENCH_P" file="notification_wrench_p.png" type ="BINDATA" /> 37 <include name="IDR_BALLOON_WRENCH_P" file="notification_wrench_p.png" type ="BINDATA" />
36 <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDA TA" /> 38 <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDA TA" />
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" /> 72 <include name="IDR_BUBBLE_T" file="bubble_t.png" type="BINDATA" />
71 <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" /> 73 <include name="IDR_BUBBLE_TL" file="bubble_tl.png" type="BINDATA" />
72 <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" /> 74 <include name="IDR_BUBBLE_TR" file="bubble_tr.png" type="BINDATA" />
73 <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDA TA" /> 75 <include name="IDR_BUBBLE_T_ARROW" file="bubble_pointer_t.png" type="BINDA TA" />
74 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" /> 76 <include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />
75 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" /> 77 <include name="IDR_CLOSE_BAR_H" file="close_bar_h.png" type="BINDATA" />
76 <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA " /> 78 <include name="IDR_CLOSE_BAR_MASK" file="close_bar_mask.png" type="BINDATA " />
77 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" /> 79 <include name="IDR_CLOSE_BAR_P" file="close_bar_p.png" type="BINDATA" />
78 <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="B INDATA" /> 80 <include name="IDR_CLOSE_BUTTON_MASK" file="close_button_mask.png" type="B INDATA" />
79 <if expr="os.find('win') != -1"> 81 <if expr="os.find('win') != -1">
80 <include name="IDR_CONFLICTS" file="conflicts.png" type="BINDATA" /> 82 <include name="IDR_CONFLICT_BADGE" file="conflict_badge.png" type="BINDA TA" />
83 <include name="IDR_CONFLICT_MENU" file="conflict_menu.png" type="BINDATA " />
81 </if> 84 </if>
82 <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_c enter_v.png" type="BINDATA" /> 85 <include name="IDR_CONSTRAINED_BOTTOM_CENTER_V" file="constrained_bottom_c enter_v.png" type="BINDATA" />
83 <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bot tom_left_corner_v.png" type="BINDATA" /> 86 <include name="IDR_CONSTRAINED_BOTTOM_LEFT_CORNER_V" file="constrained_bot tom_left_corner_v.png" type="BINDATA" />
84 <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bo ttom_right_corner_v.png" type="BINDATA" /> 87 <include name="IDR_CONSTRAINED_BOTTOM_RIGHT_CORNER_V" file="constrained_bo ttom_right_corner_v.png" type="BINDATA" />
85 <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v. png" type="BINDATA" /> 88 <include name="IDR_CONSTRAINED_LEFT_SIDE_V" file="constrained_left_side_v. png" type="BINDATA" />
86 <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_ v.png" type="BINDATA" /> 89 <include name="IDR_CONSTRAINED_RIGHT_SIDE_V" file="constrained_right_side_ v.png" type="BINDATA" />
87 <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_ v.png" type="BINDATA" /> 90 <include name="IDR_CONSTRAINED_TOP_CENTER_V" file="constrained_top_center_ v.png" type="BINDATA" />
88 <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_le ft_corner_v.png" type="BINDATA" /> 91 <include name="IDR_CONSTRAINED_TOP_LEFT_CORNER_V" file="constrained_top_le ft_corner_v.png" type="BINDATA" />
89 <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_r ight_corner_v.png" type="BINDATA" /> 92 <include name="IDR_CONSTRAINED_TOP_RIGHT_CORNER_V" file="constrained_top_r ight_corner_v.png" type="BINDATA" />
90 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" /> 93 <include name="IDR_CONTENT_TOP_CENTER" file="content_top_center.png" type= "BINDATA" />
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" /> 422 <include name="IDR_THEME_TOOLBAR" file="theme_toolbar_default.png" type= "BINDATA" />
420 </if> 423 </if>
421 <include name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" typ e="BINDATA" /> 424 <include name="IDR_THEME_WINDOW_CONTROL_BACKGROUND" file="notused.png" typ e="BINDATA" />
422 <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA " /> 425 <include name="IDR_THROBBER_LIGHT" file="throbber_light.png" type="BINDATA " />
423 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" /> 426 <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BIN DATA" />
424 <include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.pn g" type="BINDATA" /> 427 <include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.pn g" type="BINDATA" />
425 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" /> 428 <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
426 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" /> 429 <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
427 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" /> 430 <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
428 <include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BIN DATA" /> 431 <include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BIN DATA" />
432 <include name="IDR_UPDATE_BADGE" file="update_badge.png" type="BINDATA" />
429 <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" /> 433 <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" />
434 <include name="IDR_UPDATE_MENU" file="update_menu.png" type="BINDATA" />
430 <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDA TA" /> 435 <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDA TA" />
431 <include name="IDR_UPGRADE_DOT_ACTIVE" file="upgrade_dot_active.png" type= "BINDATA" /> 436 <include name="IDR_UPGRADE_DOT_ACTIVE" file="upgrade_dot_active.png" type= "BINDATA" />
432 <include name="IDR_UPGRADE_DOT_INACTIVE" file="upgrade_dot_inactive.png" t ype="BINDATA" /> 437 <include name="IDR_UPGRADE_DOT_INACTIVE" file="upgrade_dot_inactive.png" t ype="BINDATA" />
433 <include name="IDR_INFO" file="info_small.png" type="BINDATA" /> 438 <include name="IDR_INFO" file="info_small.png" type="BINDATA" />
434 <include name="IDR_WARNING" file="alert_small.png" type="BINDATA" /> 439 <include name="IDR_WARNING" file="alert_small.png" type="BINDATA" />
435 <include name="IDR_SPEECH_INPUT_MIC_EMPTY" file="speech_input_mic_empty.pn g" type="BINDATA" /> 440 <include name="IDR_SPEECH_INPUT_MIC_EMPTY" file="speech_input_mic_empty.pn g" type="BINDATA" />
436 <include name="IDR_SPEECH_INPUT_MIC_FULL" file="speech_input_mic_full.png" type="BINDATA" /> 441 <include name="IDR_SPEECH_INPUT_MIC_FULL" file="speech_input_mic_full.png" type="BINDATA" />
437 <include name="IDR_SPEECH_INPUT_MIC_MASK" file="speech_input_mic_mask.png" type="BINDATA" /> 442 <include name="IDR_SPEECH_INPUT_MIC_MASK" file="speech_input_mic_mask.png" type="BINDATA" />
438 <include name="IDR_SPEECH_INPUT_SPINNER" file="speech_input_spinner.png" t ype="BINDATA" /> 443 <include name="IDR_SPEECH_INPUT_SPINNER" file="speech_input_spinner.png" t ype="BINDATA" />
439 <if expr="pp_ifdef('_google_chrome')"> 444 <if expr="pp_ifdef('_google_chrome')">
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 <include name="IDR_DROPDOWN_TOP_H" file="textbutton_dropdown_t_h.png" ty pe="BINDATA" /> 609 <include name="IDR_DROPDOWN_TOP_H" file="textbutton_dropdown_t_h.png" ty pe="BINDATA" />
605 <include name="IDR_DROPDOWN_TOP_LEFT_H" file="textbutton_dropdown_tl_h.p ng" type="BINDATA" /> 610 <include name="IDR_DROPDOWN_TOP_LEFT_H" file="textbutton_dropdown_tl_h.p ng" type="BINDATA" />
606 <include name="IDR_DROPDOWN_TOP_LEFT_P" file="textbutton_dropdown_tl_p.p ng" type="BINDATA" /> 611 <include name="IDR_DROPDOWN_TOP_LEFT_P" file="textbutton_dropdown_tl_p.p ng" type="BINDATA" />
607 <include name="IDR_DROPDOWN_TOP_P" file="textbutton_dropdown_t_p.png" ty pe="BINDATA" /> 612 <include name="IDR_DROPDOWN_TOP_P" file="textbutton_dropdown_t_p.png" ty pe="BINDATA" />
608 <include name="IDR_DROPDOWN_TOP_RIGHT_H" file="textbutton_dropdown_tr_h. png" type="BINDATA" /> 613 <include name="IDR_DROPDOWN_TOP_RIGHT_H" file="textbutton_dropdown_tr_h. png" type="BINDATA" />
609 <include name="IDR_DROPDOWN_TOP_RIGHT_P" file="textbutton_dropdown_tr_p. png" type="BINDATA" /> 614 <include name="IDR_DROPDOWN_TOP_RIGHT_P" file="textbutton_dropdown_tr_p. png" type="BINDATA" />
610 </if> 615 </if>
611 </includes> 616 </includes>
612 </release> 617 </release>
613 </grit> 618 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/conflicts.png ('k') | chrome/browser/dom_ui/conflicts_ui.cc » ('j') | chrome/browser/ui/views/toolbar_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698