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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7622001: Revert 96306 - Multi-Profiles: Change avatar menu to bubble view (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | « chrome/app/theme/profile_selected.png ('k') | chrome/browser/profiles/avatar_menu_model.h » ('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 <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" />
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 <include name="IDR_PROFILE_AVATAR_16" file="profile_avatar_pizza.png" type ="BINDATA" /> 225 <include name="IDR_PROFILE_AVATAR_16" file="profile_avatar_pizza.png" type ="BINDATA" />
226 <include name="IDR_PROFILE_AVATAR_17" file="profile_avatar_soccer.png" typ e="BINDATA" /> 226 <include name="IDR_PROFILE_AVATAR_17" file="profile_avatar_soccer.png" typ e="BINDATA" />
227 <include name="IDR_PROFILE_AVATAR_18" file="profile_avatar_burger.png" typ e="BINDATA" /> 227 <include name="IDR_PROFILE_AVATAR_18" file="profile_avatar_burger.png" typ e="BINDATA" />
228 <include name="IDR_PROFILE_AVATAR_19" file="profile_avatar_cat.png" type=" BINDATA" /> 228 <include name="IDR_PROFILE_AVATAR_19" file="profile_avatar_cat.png" type=" BINDATA" />
229 <include name="IDR_PROFILE_AVATAR_20" file="profile_avatar_cupcake.png" ty pe="BINDATA" /> 229 <include name="IDR_PROFILE_AVATAR_20" file="profile_avatar_cupcake.png" ty pe="BINDATA" />
230 <include name="IDR_PROFILE_AVATAR_21" file="profile_avatar_dog.png" type=" BINDATA" /> 230 <include name="IDR_PROFILE_AVATAR_21" file="profile_avatar_dog.png" type=" BINDATA" />
231 <include name="IDR_PROFILE_AVATAR_22" file="profile_avatar_horse.png" type ="BINDATA" /> 231 <include name="IDR_PROFILE_AVATAR_22" file="profile_avatar_horse.png" type ="BINDATA" />
232 <include name="IDR_PROFILE_AVATAR_23" file="profile_avatar_margarita.png" type="BINDATA" /> 232 <include name="IDR_PROFILE_AVATAR_23" file="profile_avatar_margarita.png" type="BINDATA" />
233 <include name="IDR_PROFILE_AVATAR_24" file="profile_avatar_note.png" type= "BINDATA" /> 233 <include name="IDR_PROFILE_AVATAR_24" file="profile_avatar_note.png" type= "BINDATA" />
234 <include name="IDR_PROFILE_AVATAR_25" file="profile_avatar_sun_cloud.png" type="BINDATA" /> 234 <include name="IDR_PROFILE_AVATAR_25" file="profile_avatar_sun_cloud.png" type="BINDATA" />
235 <include name="IDR_PROFILE_EDIT" file="profile_edit.png" type="BINDATA" />
236 <include name="IDR_PROFILE_EDIT_HOVER" file="profile_edit_hover.png" type= "BINDATA" />
237 <include name="IDR_PROFILE_EDIT_PRESSED" file="profile_edit_pressed.png" t ype="BINDATA" />
238 <include name="IDR_PROFILE_SELECTED" file="profile_selected.png" type="BIN DATA" />
239 <include name="IDR_RESTORE_BUTTON_MASK" file="restore_button_mask.png" typ e="BINDATA" /> 235 <include name="IDR_RESTORE_BUTTON_MASK" file="restore_button_mask.png" typ e="BINDATA" />
240 <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" /> 236 <include name="IDR_SAD_TAB" file="sadtab.png" type="BINDATA" />
241 <include name="IDR_SAFEBROWSING_WARNING" file="safebrowsing_warning.png" t ype="BINDATA" /> 237 <include name="IDR_SAFEBROWSING_WARNING" file="safebrowsing_warning.png" t ype="BINDATA" />
242 <include name="IDR_SEARCH_ENGINE_DIALOG_TOP" file="search_engine_top.png" type="BINDATA" /> 238 <include name="IDR_SEARCH_ENGINE_DIALOG_TOP" file="search_engine_top.png" type="BINDATA" />
243 <if expr="pp_ifdef('_google_chrome')"> 239 <if expr="pp_ifdef('_google_chrome')">
244 <include name="IDR_SEARCH_ENGINE_LOGO_ABCSOK" file="google_chrome/search _abcsok.png" type="BINDATA" /> 240 <include name="IDR_SEARCH_ENGINE_LOGO_ABCSOK" file="google_chrome/search _abcsok.png" type="BINDATA" />
245 <include name="IDR_SEARCH_ENGINE_LOGO_ALTAVISTA" file="google_chrome/sea rch_altavista.png" type="BINDATA" /> 241 <include name="IDR_SEARCH_ENGINE_LOGO_ALTAVISTA" file="google_chrome/sea rch_altavista.png" type="BINDATA" />
246 <include name="IDR_SEARCH_ENGINE_LOGO_AOL" file="google_chrome/search_ao l.png" type="BINDATA" /> 242 <include name="IDR_SEARCH_ENGINE_LOGO_AOL" file="google_chrome/search_ao l.png" type="BINDATA" />
247 <include name="IDR_SEARCH_ENGINE_LOGO_ASK" file="google_chrome/search_as k.png" type="BINDATA" /> 243 <include name="IDR_SEARCH_ENGINE_LOGO_ASK" file="google_chrome/search_as k.png" type="BINDATA" />
248 <include name="IDR_SEARCH_ENGINE_LOGO_BAIDU" file="google_chrome/search_ baidu.png" type="BINDATA" /> 244 <include name="IDR_SEARCH_ENGINE_LOGO_BAIDU" file="google_chrome/search_ baidu.png" type="BINDATA" />
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 <include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BIN DATA" /> 583 <include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BIN DATA" />
588 <include name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disa bled.png" type="BINDATA" /> 584 <include name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disa bled.png" type="BINDATA" />
589 <include name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png " type="BINDATA" /> 585 <include name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png " type="BINDATA" />
590 <include name="IDR_VOLUME_BUBBLE_UP_ICON" file="volume_up_icon.png" type ="BINDATA" /> 586 <include name="IDR_VOLUME_BUBBLE_UP_ICON" file="volume_up_icon.png" type ="BINDATA" />
591 <include name="IDR_VOLUME_BUBBLE_DOWN_ICON" file="volume_down_icon.png" type="BINDATA" /> 587 <include name="IDR_VOLUME_BUBBLE_DOWN_ICON" file="volume_down_icon.png" type="BINDATA" />
592 <include name="IDR_VOLUME_BUBBLE_MUTE_ICON" file="volume_mute_icon.png" type="BINDATA" /> 588 <include name="IDR_VOLUME_BUBBLE_MUTE_ICON" file="volume_mute_icon.png" type="BINDATA" />
593 </if> 589 </if>
594 </includes> 590 </includes>
595 </release> 591 </release>
596 </grit> 592 </grit>
OLDNEW
« no previous file with comments | « chrome/app/theme/profile_selected.png ('k') | chrome/browser/profiles/avatar_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698