diff options
| author | oritm@chromium.org <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 23:42:46 +0000 |
|---|---|---|
| committer | oritm@chromium.org <oritm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 23:42:46 +0000 |
| commit | bf5d30f579f505f85e8f0567d526500e6c3d8d4b (patch) | |
| tree | d0b4ba9e4b0d87512117c56e2f0b6faa62f43b45 /chrome/app | |
| parent | 9b7747ddb89625c2b1cbe0c4eb71c45e8abb6b36 (diff) | |
| download | chromium_src-bf5d30f579f505f85e8f0567d526500e6c3d8d4b.zip chromium_src-bf5d30f579f505f85e8f0567d526500e6c3d8d4b.tar.gz chromium_src-bf5d30f579f505f85e8f0567d526500e6c3d8d4b.tar.bz2 | |
Merge 113236 - Replace the Slideshow with the Photo Editor
BUG=chromium-os:23750
TEST=
Review URL: http://codereview.chromium.org/8799006
TBR=kaznacheev@chromium.org
Review URL: http://codereview.chromium.org/8864003
git-svn-id: svn://svn.chromium.org/chrome/branches/963/src@113504 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/generated_resources.grd | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 41c9e44..347fa5f 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -4933,11 +4933,6 @@ Keep your key file in a safe place. You will need it to create new versions of y <message name="IDS_FLAGS_ENABLE_EXTENSION_ALERTS_DESCRIPTION" desc="Description for the flag to enable extension alerts."> Enable various alerts about changes in extension state. </message> - <message name="IDS_FLAGS_ENABLE_PHOTO_EDITOR_NAME" desc="Title for the flag to enable the photo editor."> - Photo Editor - </message> - <message name="IDS_FLAGS_ENABLE_PHOTO_EDITOR_DESCRIPTION" desc="Description for the flag to enable the photo editor."> - </message> <message name="IDS_FLAGS_ENABLE_MEDIA_SOURCE_NAME" desc="Title for the flag to enable the Media Source API on <video> elements."> Enable Media Source API on <video> elements. </message> |