Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 797693002: easy-unlock: Get rid of extra flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/generated_resources.grd
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 569c69c3107aa3c6aba9aa2d4acfef9ff7c90fd0..3d21c0282dc632f9a095cec5d1fba0d1e03b498d 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6589,13 +6589,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
Disable Smart Lock
</message>
<message name="IDS_FLAGS_DISABLE_EASY_UNLOCK_DESCRIPTION" desc="Description of the flag to disable Easy unlock.">
- Do not use Smart Lock, which allows you to unlock your Chromebook when in proximity to your phone.
- </message>
- <message name="IDS_FLAGS_DISABLE_EASY_SIGNIN_NAME" desc="Name of the flag to disable Easy sign-in.">
- Disable Smart Lock on sign-in screen.
- </message>
- <message name="IDS_FLAGS_DISABLE_EASY_SIGNIN_DESCRIPTION" desc="Description of the flag to disable Easy sign-in.">
- Do not use Smart Lock on sign-in screen, which allows you to sign in to your Chromebook when in proximity to your phone.
+ Do not use Smart Lock, which allows you to unlock your Chromebook when in proximity to your phone. If you are the owner of the device, this also turns of Smart Lock on sign-in screen.
Ilya Sherman 2014/12/11 23:34:52 nit: "turns of" -> "turns off"
xiyuan 2014/12/11 23:38:07 Done.
</message>
</if>
<message name="IDS_FLAGS_ENABLE_STREAMLINED_HOSTED_APPS_NAME" desc="Name of the flag to enable streamlined hosted apps.">
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698