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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 408833004: Revert 284417 "Move default user profile images strings and reso..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 | « trunk/src/chrome/app/theme/default_200_percent/avatar_upsidedown.png ('k') | trunk/src/chrome/browser/chromeos/login/screens/user_image_screen.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 grd file contains images that are pre-scaled for device scale 2 <!-- This grd file contains images that are pre-scaled for device scale
3 factors. The image returned by |base::ResourceBundle::GetImageNamed| 3 factors. The image returned by |base::ResourceBundle::GetImageNamed|
4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The 4 will contain multiple |gfx:ImageSkiaReps| for each scale factors. The
5 |fallback_to_low_resolution| attribute controls behavior when 5 |fallback_to_low_resolution| attribute controls behavior when
6 an image file is missing for target scale factor. If true, chrome 6 an image file is missing for target scale factor. If true, chrome
7 will automatically scale the 1x image to the target scale factor. 7 will automatically scale the 1x image to the target scale factor.
8 If false, build will fail due to missing resources. This is 8 If false, build will fail due to missing resources. This is
9 currently set to true for all resources, but the default will 9 currently set to true for all resources, but the default will
10 become false in near future. 10 become false in near future.
(...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after
438 <structure type="chrome_scaled_image" name="IDR_LOCAL_DISCOVERY_CLOUDPRI NT_ICON" file="common/cloudprint.png" /> 438 <structure type="chrome_scaled_image" name="IDR_LOCAL_DISCOVERY_CLOUDPRI NT_ICON" file="common/cloudprint.png" />
439 </if> 439 </if>
440 <!-- TODO(calamity): The 1x local ntp resources require a proper version. 440 <!-- TODO(calamity): The 1x local ntp resources require a proper version.
441 See crbug.com/363519. --> 441 See crbug.com/363519. -->
442 <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_LOGO_PNG" file="common/ntp_google_logo.png" /> 442 <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_LOGO_PNG" file="common/ntp_google_logo.png" />
443 <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_WHITE_LOG O_PNG" file="common/ntp_white_google_logo.png" /> 443 <structure type="chrome_scaled_image" name="IDR_LOCAL_NTP_IMAGES_WHITE_LOG O_PNG" file="common/ntp_white_google_logo.png" />
444 <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="c ommon/location_bar_http.png" /> 444 <structure type="chrome_scaled_image" name="IDR_LOCATION_BAR_HTTP" file="c ommon/location_bar_http.png" />
445 <if expr="chromeos"> 445 <if expr="chromeos">
446 <!-- TODO(nkostylev): This resource needs to be removed when cros login code is moved to ash. --> 446 <!-- TODO(nkostylev): This resource needs to be removed when cros login code is moved to ash. -->
447 <structure type="chrome_scaled_image" name="IDR_LAUNCHER_BACKGROUND" fil e="cros/launcher_background.png" /> 447 <structure type="chrome_scaled_image" name="IDR_LAUNCHER_BACKGROUND" fil e="cros/launcher_background.png" />
448 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER" file ="avatar_beaker.png" />
449 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_1" fi le="avatar_bee.png" />
450 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_2" fi le="avatar_briefcase.png" />
451 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_3" fi le="avatar_circles.png" />
452 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_4" fi le="avatar_cloud.png" />
453 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_5" fi le="avatar_cupcake.png" />
454 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_6" fi le="avatar_day.png" />
455 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_7" fi le="avatar_flower.png" />
456 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_8" fi le="avatar_globe.png" />
457 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_9" fi le="avatar_hotair.png" />
458 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_10" f ile="avatar_ladybug.png" />
459 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_11" f ile="avatar_leaf.png" />
460 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_12" f ile="avatar_night.png" />
461 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_13" f ile="avatar_plane.png" />
462 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_14" f ile="avatar_robot_body.png" />
463 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_15" f ile="avatar_robot_head.png" />
464 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_16" f ile="avatar_toolbox.png" />
465 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_17" f ile="avatar_user_color.png" />
466 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_18" f ile="avatar_user_enterprise.png" />
467 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_19" f ile="avatar_bicycle.png" />
468 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_20" f ile="avatar_bokeh.png" />
469 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_21" f ile="avatar_chess.png" />
470 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_22" f ile="avatar_coffee.png" />
471 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_23" f ile="avatar_dragonfly.png" />
472 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_24" f ile="avatar_frog.png" />
473 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_25" f ile="avatar_ganzania.png" />
474 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_26" f ile="avatar_jackrussellterrier.png" />
475 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_27" f ile="avatar_jellyfish.png" />
476 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_28" f ile="avatar_kiwi.png" />
477 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_29" f ile="avatar_penguin.png" />
478 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_30" f ile="avatar_rainbowfish.png" />
479 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_31" f ile="avatar_recordplayer.png" />
480 <structure type="chrome_scaled_image" name="IDR_LOGIN_DEFAULT_USER_32" f ile="avatar_upsidedown.png" />
448 <structure type="chrome_scaled_image" name="IDR_LOGIN_PASSWORD_CAPS_LOCK " file="cros/login_password_capslock.png" /> 481 <structure type="chrome_scaled_image" name="IDR_LOGIN_PASSWORD_CAPS_LOCK " file="cros/login_password_capslock.png" />
449 </if> 482 </if>
450 <if expr="chromeos"> 483 <if expr="chromeos">
451 <structure type="chrome_scaled_image" name="IDR_KIOSK_APP_USER_POD_ICON" file="cros/kiosk_app_user_pod_icon.png" /> 484 <structure type="chrome_scaled_image" name="IDR_KIOSK_APP_USER_POD_ICON" file="cros/kiosk_app_user_pod_icon.png" />
452 </if> 485 </if>
453 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_ICON" file ="common/limited_user.png" /> 486 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_ICON" file ="common/limited_user.png" />
454 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_LABEL_BOTT OM" file="common/supervised_user_theme/label_bg_bottom.png" /> 487 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_LABEL_BOTT OM" file="common/supervised_user_theme/label_bg_bottom.png" />
455 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_LABEL_BOTT OM_LEFT" file="common/supervised_user_theme/label_bg_bottom_left.png" /> 488 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_LABEL_BOTT OM_LEFT" file="common/supervised_user_theme/label_bg_bottom_left.png" />
456 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_LABEL_BOTT OM_RIGHT" file="common/supervised_user_theme/label_bg_bottom_right.png" /> 489 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_LABEL_BOTT OM_RIGHT" file="common/supervised_user_theme/label_bg_bottom_right.png" />
457 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_LABEL_CENT ER" file="common/supervised_user_theme/label_bg_center.png" /> 490 <structure type="chrome_scaled_image" name="IDR_SUPERVISED_USER_LABEL_CENT ER" file="common/supervised_user_theme/label_bg_center.png" />
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" /> 1254 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL " file="common/mail.png" />
1222 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" /> 1255 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _HOVER" file="common/mail_hover.png" />
1223 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" /> 1256 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_EMAIL _PRESSED" file="common/mail_pressed.png" />
1224 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" /> 1257 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT" file="common/chat.png" />
1225 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" /> 1258 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ HOVER" file="common/chat_hover.png" />
1226 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" /> 1259 <structure type="chrome_scaled_image" name="IDR_PEOPLE_SEARCH_ACTION_CHAT_ PRESSED" file="common/chat_pressed.png" />
1227 1260
1228 </structures> 1261 </structures>
1229 </release> 1262 </release>
1230 </grit> 1263 </grit>
OLDNEW
« no previous file with comments | « trunk/src/chrome/app/theme/default_200_percent/avatar_upsidedown.png ('k') | trunk/src/chrome/browser/chromeos/login/screens/user_image_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698