From 5f5519db02163d6393e267384633381f43bf4050 Mon Sep 17 00:00:00 2001 From: "avayvod@chromium.org" Date: Sat, 7 May 2011 05:52:57 +0000 Subject: [cros] Added new default user avatars. Code change is trivial so won't make it a separate change. R=zelidrag@chromium.org BUG=chromiumos:14618 TEST=None Review URL: http://codereview.chromium.org/6956011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84550 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/theme/avatar_beaker.png | Bin 0 -> 31485 bytes chrome/app/theme/avatar_bee.png | Bin 0 -> 34083 bytes chrome/app/theme/avatar_briefcase.png | Bin 0 -> 19813 bytes chrome/app/theme/avatar_circles.png | Bin 0 -> 52027 bytes chrome/app/theme/avatar_cloud.png | Bin 0 -> 25695 bytes chrome/app/theme/avatar_cupcake.png | Bin 0 -> 46018 bytes chrome/app/theme/avatar_day.png | Bin 0 -> 29164 bytes chrome/app/theme/avatar_flower.png | Bin 0 -> 51659 bytes chrome/app/theme/avatar_globe.png | Bin 0 -> 45533 bytes chrome/app/theme/avatar_hotair.png | Bin 0 -> 35643 bytes chrome/app/theme/avatar_ladybug.png | Bin 0 -> 34130 bytes chrome/app/theme/avatar_leaf.png | Bin 0 -> 43517 bytes chrome/app/theme/avatar_night.png | Bin 0 -> 32993 bytes chrome/app/theme/avatar_plane.png | Bin 0 -> 20681 bytes chrome/app/theme/avatar_robot_body.png | Bin 0 -> 45328 bytes chrome/app/theme/avatar_robot_head.png | Bin 0 -> 44677 bytes chrome/app/theme/avatar_toolbox.png | Bin 0 -> 26895 bytes chrome/app/theme/login_guest.png | Bin 41330 -> 18682 bytes chrome/app/theme/theme_resources.grd | 22 ++++++++++++++++----- .../browser/chromeos/login/default_user_images.cc | 14 ++++++++++++- 20 files changed, 30 insertions(+), 6 deletions(-) create mode 100644 chrome/app/theme/avatar_beaker.png create mode 100644 chrome/app/theme/avatar_bee.png create mode 100644 chrome/app/theme/avatar_briefcase.png create mode 100644 chrome/app/theme/avatar_circles.png create mode 100644 chrome/app/theme/avatar_cloud.png create mode 100644 chrome/app/theme/avatar_cupcake.png create mode 100644 chrome/app/theme/avatar_day.png create mode 100644 chrome/app/theme/avatar_flower.png create mode 100644 chrome/app/theme/avatar_globe.png create mode 100644 chrome/app/theme/avatar_hotair.png create mode 100644 chrome/app/theme/avatar_ladybug.png create mode 100644 chrome/app/theme/avatar_leaf.png create mode 100644 chrome/app/theme/avatar_night.png create mode 100644 chrome/app/theme/avatar_plane.png create mode 100644 chrome/app/theme/avatar_robot_body.png create mode 100644 chrome/app/theme/avatar_robot_head.png create mode 100644 chrome/app/theme/avatar_toolbox.png diff --git a/chrome/app/theme/avatar_beaker.png b/chrome/app/theme/avatar_beaker.png new file mode 100644 index 0000000..14768a3 Binary files /dev/null and b/chrome/app/theme/avatar_beaker.png differ diff --git a/chrome/app/theme/avatar_bee.png b/chrome/app/theme/avatar_bee.png new file mode 100644 index 0000000..a419867 Binary files /dev/null and b/chrome/app/theme/avatar_bee.png differ diff --git a/chrome/app/theme/avatar_briefcase.png b/chrome/app/theme/avatar_briefcase.png new file mode 100644 index 0000000..2289e39 Binary files /dev/null and b/chrome/app/theme/avatar_briefcase.png differ diff --git a/chrome/app/theme/avatar_circles.png b/chrome/app/theme/avatar_circles.png new file mode 100644 index 0000000..02461da Binary files /dev/null and b/chrome/app/theme/avatar_circles.png differ diff --git a/chrome/app/theme/avatar_cloud.png b/chrome/app/theme/avatar_cloud.png new file mode 100644 index 0000000..f08d1f2 Binary files /dev/null and b/chrome/app/theme/avatar_cloud.png differ diff --git a/chrome/app/theme/avatar_cupcake.png b/chrome/app/theme/avatar_cupcake.png new file mode 100644 index 0000000..3c7cf87 Binary files /dev/null and b/chrome/app/theme/avatar_cupcake.png differ diff --git a/chrome/app/theme/avatar_day.png b/chrome/app/theme/avatar_day.png new file mode 100644 index 0000000..d093880 Binary files /dev/null and b/chrome/app/theme/avatar_day.png differ diff --git a/chrome/app/theme/avatar_flower.png b/chrome/app/theme/avatar_flower.png new file mode 100644 index 0000000..318ff52 Binary files /dev/null and b/chrome/app/theme/avatar_flower.png differ diff --git a/chrome/app/theme/avatar_globe.png b/chrome/app/theme/avatar_globe.png new file mode 100644 index 0000000..187e283 Binary files /dev/null and b/chrome/app/theme/avatar_globe.png differ diff --git a/chrome/app/theme/avatar_hotair.png b/chrome/app/theme/avatar_hotair.png new file mode 100644 index 0000000..ea4e55b Binary files /dev/null and b/chrome/app/theme/avatar_hotair.png differ diff --git a/chrome/app/theme/avatar_ladybug.png b/chrome/app/theme/avatar_ladybug.png new file mode 100644 index 0000000..4f085a3 Binary files /dev/null and b/chrome/app/theme/avatar_ladybug.png differ diff --git a/chrome/app/theme/avatar_leaf.png b/chrome/app/theme/avatar_leaf.png new file mode 100644 index 0000000..ad205ba Binary files /dev/null and b/chrome/app/theme/avatar_leaf.png differ diff --git a/chrome/app/theme/avatar_night.png b/chrome/app/theme/avatar_night.png new file mode 100644 index 0000000..6e4f529 Binary files /dev/null and b/chrome/app/theme/avatar_night.png differ diff --git a/chrome/app/theme/avatar_plane.png b/chrome/app/theme/avatar_plane.png new file mode 100644 index 0000000..957a865 Binary files /dev/null and b/chrome/app/theme/avatar_plane.png differ diff --git a/chrome/app/theme/avatar_robot_body.png b/chrome/app/theme/avatar_robot_body.png new file mode 100644 index 0000000..9d6d2a7 Binary files /dev/null and b/chrome/app/theme/avatar_robot_body.png differ diff --git a/chrome/app/theme/avatar_robot_head.png b/chrome/app/theme/avatar_robot_head.png new file mode 100644 index 0000000..a2bd888 Binary files /dev/null and b/chrome/app/theme/avatar_robot_head.png differ diff --git a/chrome/app/theme/avatar_toolbox.png b/chrome/app/theme/avatar_toolbox.png new file mode 100644 index 0000000..9793cf6 Binary files /dev/null and b/chrome/app/theme/avatar_toolbox.png differ diff --git a/chrome/app/theme/login_guest.png b/chrome/app/theme/login_guest.png index d325d54..5823967 100644 Binary files a/chrome/app/theme/login_guest.png and b/chrome/app/theme/login_guest.png differ diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd index 0993f7c..69ecf91 100644 --- a/chrome/app/theme/theme_resources.grd +++ b/chrome/app/theme/theme_resources.grd @@ -439,11 +439,23 @@ - - - - - + + + + + + + + + + + + + + + + + diff --git a/chrome/browser/chromeos/login/default_user_images.cc b/chrome/browser/chromeos/login/default_user_images.cc index c72d342..d7f12e0 100644 --- a/chrome/browser/chromeos/login/default_user_images.cc +++ b/chrome/browser/chromeos/login/default_user_images.cc @@ -70,7 +70,19 @@ const int kDefaultImageResources[] = { IDR_LOGIN_DEFAULT_USER_1, IDR_LOGIN_DEFAULT_USER_2, IDR_LOGIN_DEFAULT_USER_3, - IDR_LOGIN_DEFAULT_USER_4 + IDR_LOGIN_DEFAULT_USER_4, + IDR_LOGIN_DEFAULT_USER_5, + IDR_LOGIN_DEFAULT_USER_6, + IDR_LOGIN_DEFAULT_USER_7, + IDR_LOGIN_DEFAULT_USER_8, + IDR_LOGIN_DEFAULT_USER_9, + IDR_LOGIN_DEFAULT_USER_10, + IDR_LOGIN_DEFAULT_USER_11, + IDR_LOGIN_DEFAULT_USER_12, + IDR_LOGIN_DEFAULT_USER_13, + IDR_LOGIN_DEFAULT_USER_14, + IDR_LOGIN_DEFAULT_USER_15, + IDR_LOGIN_DEFAULT_USER_16, }; const int kDefaultImagesCount = arraysize(kDefaultImageResources); -- cgit v1.1