summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 13:47:42 +0000
committeravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-09 13:47:42 +0000
commiteccad407bf7b5e9cd8eb70b9cbd2315482070711 (patch)
tree02e269b9e26f2ad4f8b830ae429806da48a39c3e
parentca29bc6ce6ab9c9f435b1829beeb1d82db9a41ff (diff)
downloadchromium_src-eccad407bf7b5e9cd8eb70b9cbd2315482070711.zip
chromium_src-eccad407bf7b5e9cd8eb70b9cbd2315482070711.tar.gz
chromium_src-eccad407bf7b5e9cd8eb70b9cbd2315482070711.tar.bz2
New resources for camera UI: disabled snapshot button and initial camera image.
BUG=chromium-os:8669 TEST=None. TBR=nkostylev@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65522 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/app/theme/initializing_video.pngbin0 -> 3835 bytes
-rw-r--r--chrome/app/theme/snapshot_wide_disabled.pngbin0 -> 3864 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd2
4 files changed, 5 insertions, 3 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 07ac811..1786eb6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3372,10 +3372,10 @@ each locale. -->
</message>
<!-- User Image Selection Dialog -->
<message name="IDS_USER_IMAGE_SCREEN_TITLE" desc="String to be displayed in the title bar of the user image selection dialog">
- Smile! Take a picture of yourself and set it as your account profile.
+ Take a photo to identify your account at sign-in. You may change your photo later in Preferences.
</message>
- <message name="IDS_USER_IMAGE_SELECTED_TOOLTIP" desc="Tooltip for preview of selected user image">
- Currently selected image
+ <message name="IDS_USER_IMAGE_NO_VIDEO" desc="Error text to be displayed on user image if camera fails to initialize">
+ The camera failed to initialize. Please, try setting your photo later in Preferences.
</message>
<!-- OOBE progress bar labels -->
<message name="IDS_OOBE_SELECT_NETWORK" desc="The label of OOBE progress bar step, must be short">
diff --git a/chrome/app/theme/initializing_video.png b/chrome/app/theme/initializing_video.png
new file mode 100644
index 0000000..6d79026
--- /dev/null
+++ b/chrome/app/theme/initializing_video.png
Binary files differ
diff --git a/chrome/app/theme/snapshot_wide_disabled.png b/chrome/app/theme/snapshot_wide_disabled.png
new file mode 100644
index 0000000..b5f5a94
--- /dev/null
+++ b/chrome/app/theme/snapshot_wide_disabled.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index e8a3963..dd8672e 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -574,6 +574,8 @@
<include name="IDR_USER_IMAGE_NO_VIDEO" file="no_video.png" type="BINDATA" />
<include name="IDR_USER_IMAGE_CAPTURE" file="snapshot_wide.png" type="BINDATA" />
<include name="IDR_USER_IMAGE_RECYCLE" file="discard_wide.png" type="BINDATA" />
+ <include name="IDR_USER_IMAGE_CAPTURE_DISABLED" file="snapshot_wide_disabled.png" type="BINDATA" />
+ <include name="IDR_USER_IMAGE_INITIALIZING" file="initializing_video.png" type="BINDATA" />
<include name="IDR_VOLUMEBUBBLE_ICON" file="volume_icon.png" type="BINDATA" />
<include name="IDR_SCROLL_BACKGROUND" file="chromeos_scroll_background.png" type="BINDATA" />
<include name="IDR_SCROLL_BACKGROUND_BORDER_UP" file="chromeos_scroll_background_border_up.png" type="BINDATA" />