summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 20:27:00 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-31 20:27:00 +0000
commit8604de292126c8a51c163f082a54d61893222917 (patch)
treea57d5ba25bbb5dbae5627b83927c5e938cb17e67 /chrome/app
parent7f44ba4d86341308a888455858426adcc1e713e4 (diff)
downloadchromium_src-8604de292126c8a51c163f082a54d61893222917.zip
chromium_src-8604de292126c8a51c163f082a54d61893222917.tar.gz
chromium_src-8604de292126c8a51c163f082a54d61893222917.tar.bz2
ash: Rename kAuraWindowAnimationsDisabled to kAshWindowAnimationsDisabled
BUG=none TEST=compiles Review URL: https://chromiumcodereview.appspot.com/10456035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139855 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index ac0c97a..b60516c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -11929,23 +11929,23 @@ Some features may be unavailable. Please check that the profile exists and you
<message name="IDS_GOOGLE_MAILTO_HANDLER_URL">
https:////mail.google.com//mail//?extsrc=mailto&amp;url=%s
</message>
-
+
<!-- The name for the Google mailto service. -->
<message name="IDS_GOOGLE_MAILTO_HANDLER_NAME">
Google.com Mail
</message>
-
+
<!-- The URL for the Google webcal service. -->
<message name="IDS_GOOGLE_WEBCAL_HANDLER_URL">
https:////www.google.com//calendar//render?cid=%s
</message>
-
+
<!-- The name for the Google webcal service. -->
<message name="IDS_GOOGLE_WEBCAL_HANDLER_NAME">
Google Calendar
</message>
</if>
-
+
<!-- Sync promo page chrome://signin -->
<message name="IDS_SYNC_PROMO_TAB_TITLE" desc="The title of the sync promo tab.">
Sign in
@@ -16373,7 +16373,7 @@ Battery full
When enabled, will use ClientOAuth to connect a profile to a Google account. Otherwise ClientLogin is used.
ClientOAuth permits using verification codes instead of ASPs during authentication.
</message>
-
+
</messages>
<structures fallback_to_english="true">
<!-- Make sure these stay in sync with the structures in generated_resources.grd. -->