summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authoravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 07:52:08 +0000
committeravayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-01 07:52:08 +0000
commit69be2e5311fee3b72edc19733d67b941a6749cfe (patch)
treefd0b40a3dc5bdf4e555fb0c00a7f35118d9d1463 /chrome/app
parente1ebb00f6c5dfafb24480b5f7fe563dd2e2558d2 (diff)
downloadchromium_src-69be2e5311fee3b72edc19733d67b941a6749cfe.zip
chromium_src-69be2e5311fee3b72edc19733d67b941a6749cfe.tar.gz
chromium_src-69be2e5311fee3b72edc19733d67b941a6749cfe.tar.bz2
Extracted camera UI from UserImageView to TakePhotoView.
Extracted camera logic from UserImageScreen to CameraController. Added Take Photo button to Personal settings page and dialog that allows taking a new picture. R=dpolukhin@chromium.org BUG=chromium-os:2348 TEST=Verify that after first login picture taking screen is working as expected. Go to chrome://settings/personal and click Take Photo button, take a new picture using the dialog. Review URL: http://codereview.chromium.org/6778011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80135 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 4b6afb3..e976280 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -9598,6 +9598,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_CHANGE_PICTURE" desc="In the Personal Stuff settings tab, the text on the button to change picture for the current user.">
Change picture...
</message>
+ <message name="IDS_OPTIONS_TAKE_PHOTO" desc="In the Personal Stuff settings tab, the text on the button to take photo of the current user.">
+ Take photo...
+ </message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_TAB_WIFI" desc="In settings Internet options, the title for buy cellular data plan button.">
Wi-Fi
</message>