diff options
author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-07 05:52:57 +0000 |
---|---|---|
committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-07 05:52:57 +0000 |
commit | 5f5519db02163d6393e267384633381f43bf4050 (patch) | |
tree | bb851688e0799ff676b2487fe6f4f6176722b096 | |
parent | 4992909091fb8b4fbb6bb4e178c5b3e77d49f99b (diff) | |
download | chromium_src-5f5519db02163d6393e267384633381f43bf4050.zip chromium_src-5f5519db02163d6393e267384633381f43bf4050.tar.gz chromium_src-5f5519db02163d6393e267384633381f43bf4050.tar.bz2 |
[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
20 files changed, 30 insertions, 6 deletions
diff --git a/chrome/app/theme/avatar_beaker.png b/chrome/app/theme/avatar_beaker.png Binary files differnew file mode 100644 index 0000000..14768a3 --- /dev/null +++ b/chrome/app/theme/avatar_beaker.png diff --git a/chrome/app/theme/avatar_bee.png b/chrome/app/theme/avatar_bee.png Binary files differnew file mode 100644 index 0000000..a419867 --- /dev/null +++ b/chrome/app/theme/avatar_bee.png diff --git a/chrome/app/theme/avatar_briefcase.png b/chrome/app/theme/avatar_briefcase.png Binary files differnew file mode 100644 index 0000000..2289e39 --- /dev/null +++ b/chrome/app/theme/avatar_briefcase.png diff --git a/chrome/app/theme/avatar_circles.png b/chrome/app/theme/avatar_circles.png Binary files differnew file mode 100644 index 0000000..02461da --- /dev/null +++ b/chrome/app/theme/avatar_circles.png diff --git a/chrome/app/theme/avatar_cloud.png b/chrome/app/theme/avatar_cloud.png Binary files differnew file mode 100644 index 0000000..f08d1f2 --- /dev/null +++ b/chrome/app/theme/avatar_cloud.png diff --git a/chrome/app/theme/avatar_cupcake.png b/chrome/app/theme/avatar_cupcake.png Binary files differnew file mode 100644 index 0000000..3c7cf87 --- /dev/null +++ b/chrome/app/theme/avatar_cupcake.png diff --git a/chrome/app/theme/avatar_day.png b/chrome/app/theme/avatar_day.png Binary files differnew file mode 100644 index 0000000..d093880 --- /dev/null +++ b/chrome/app/theme/avatar_day.png diff --git a/chrome/app/theme/avatar_flower.png b/chrome/app/theme/avatar_flower.png Binary files differnew file mode 100644 index 0000000..318ff52 --- /dev/null +++ b/chrome/app/theme/avatar_flower.png diff --git a/chrome/app/theme/avatar_globe.png b/chrome/app/theme/avatar_globe.png Binary files differnew file mode 100644 index 0000000..187e283 --- /dev/null +++ b/chrome/app/theme/avatar_globe.png diff --git a/chrome/app/theme/avatar_hotair.png b/chrome/app/theme/avatar_hotair.png Binary files differnew file mode 100644 index 0000000..ea4e55b --- /dev/null +++ b/chrome/app/theme/avatar_hotair.png diff --git a/chrome/app/theme/avatar_ladybug.png b/chrome/app/theme/avatar_ladybug.png Binary files differnew file mode 100644 index 0000000..4f085a3 --- /dev/null +++ b/chrome/app/theme/avatar_ladybug.png diff --git a/chrome/app/theme/avatar_leaf.png b/chrome/app/theme/avatar_leaf.png Binary files differnew file mode 100644 index 0000000..ad205ba --- /dev/null +++ b/chrome/app/theme/avatar_leaf.png diff --git a/chrome/app/theme/avatar_night.png b/chrome/app/theme/avatar_night.png Binary files differnew file mode 100644 index 0000000..6e4f529 --- /dev/null +++ b/chrome/app/theme/avatar_night.png diff --git a/chrome/app/theme/avatar_plane.png b/chrome/app/theme/avatar_plane.png Binary files differnew file mode 100644 index 0000000..957a865 --- /dev/null +++ b/chrome/app/theme/avatar_plane.png diff --git a/chrome/app/theme/avatar_robot_body.png b/chrome/app/theme/avatar_robot_body.png Binary files differnew file mode 100644 index 0000000..9d6d2a7 --- /dev/null +++ b/chrome/app/theme/avatar_robot_body.png diff --git a/chrome/app/theme/avatar_robot_head.png b/chrome/app/theme/avatar_robot_head.png Binary files differnew file mode 100644 index 0000000..a2bd888 --- /dev/null +++ b/chrome/app/theme/avatar_robot_head.png diff --git a/chrome/app/theme/avatar_toolbox.png b/chrome/app/theme/avatar_toolbox.png Binary files differnew file mode 100644 index 0000000..9793cf6 --- /dev/null +++ b/chrome/app/theme/avatar_toolbox.png diff --git a/chrome/app/theme/login_guest.png b/chrome/app/theme/login_guest.png Binary files differindex d325d54..5823967 100644 --- a/chrome/app/theme/login_guest.png +++ b/chrome/app/theme/login_guest.png 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 @@ <include name="IDR_DROPDOWN_TOP_RIGHT_H" file="textbutton_dropdown_tr_h.png" type="BINDATA" /> <include name="IDR_DROPDOWN_TOP_RIGHT_P" file="textbutton_dropdown_tr_p.png" type="BINDATA" /> <include name="IDR_INCOGNITO_GUY" file="incognito_guy.png" type="BINDATA" /> - <include name="IDR_LOGIN_DEFAULT_USER" file="login_default.png" type="BINDATA" /> - <include name="IDR_LOGIN_DEFAULT_USER_1" file="login_default_green.png" type="BINDATA" /> - <include name="IDR_LOGIN_DEFAULT_USER_2" file="login_default_blue.png" type="BINDATA" /> - <include name="IDR_LOGIN_DEFAULT_USER_3" file="login_default_yellow.png" type="BINDATA" /> - <include name="IDR_LOGIN_DEFAULT_USER_4" file="login_default_red.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER" file="avatar_beaker.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_1" file="avatar_bee.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_2" file="avatar_briefcase.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_3" file="avatar_circles.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_4" file="avatar_cloud.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_5" file="avatar_cupcake.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_6" file="avatar_day.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_7" file="avatar_flower.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_8" file="avatar_globe.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_9" file="avatar_hotair.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_10" file="avatar_ladybug.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_11" file="avatar_leaf.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_12" file="avatar_night.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_13" file="avatar_plane.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_14" file="avatar_robot_body.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_15" file="avatar_robot_head.png" type="BINDATA" /> + <include name="IDR_LOGIN_DEFAULT_USER_16" file="avatar_toolbox.png" type="BINDATA" /> <include name="IDR_LOGIN_GUEST" file="login_guest.png" type="BINDATA" /> <include name="IDR_LOGIN_ADD_USER" file="login_add_user.png" type="BINDATA" /> <include name="IDR_LOGIN_ADD_USER_HOVER" file="login_add_user_hover.png" type="BINDATA" /> 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); |