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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/generated_resources.grd

Side-by-side diff isn't available for this file because of its large size.
Issue 323133005: Enable consistent identity on android platform by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 6 months 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') | chrome/browser/about_flags.cc » ('J')
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 7736c4dae99b63ad0b2ba1d865efa8db8f3f3b9c..336608fdb7da43baf32e63904233a2512db08563 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -13533,18 +13533,35 @@ Do you accept?
Dark Theme
</message>
- <message name="IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME" desc="Title for the flag to enable the new profile management.">
- Enable new profile management system
- </message>
- <message name="IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION" desc="Description for the flag to enable the new profile management.">
- Enables the new profile management system, including profile lock and the new avatar menu UI.
- </message>
- <message name="IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME" desc="Title for the flag to enable the account consistency between browser and cookie jar.">
- Enable identity consistency between browser and cookie jar
- </message>
- <message name="IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION" desc="Description for the flag to enable the account consistency between browser and cookie jar.">
- When enabled, the browser manages signing in and out of Google accounts.
- </message>
+ <if expr="is_android">
+ <message name="IDS_FLAGS_DISABLE_NEW_PROFILE_MANAGEMENT_NAME" desc="Title for the flag to disable the new profile management.">
+ Enable old profile management system
+ </message>
+ <message name="IDS_FLAGS_DISABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION" desc="Description for the flag to disable the new profile management.">
+ Enables old profile management system, without profile lock or the new avatar menu UI.
+ </message>
+ <message name="IDS_FLAGS_DISABLE_ACCOUNT_CONSISTENCY_NAME" desc="Title for the flag to disable the account consistency between browser and cookie jar.">
+ Enable to stop identity consistency between browser and cookie jar
+ </message>
+ <message name="IDS_FLAGS_DISABLE_ACCOUNT_CONSISTENCY_DESCRIPTION" desc="Description for the flag to disable the account consistency between browser and cookie jar.">
+ When enabled, the browser does not manage signing in and out of Google accounts.
+ </message>
+ </if>
+ <if expr="not is_android">
+ <message name="IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_NAME" desc="Title for the flag to enable the new profile management.">
+ Enable new profile management system
+ </message>
+ <message name="IDS_FLAGS_ENABLE_NEW_PROFILE_MANAGEMENT_DESCRIPTION" desc="Description for the flag to enable the new profile management.">
+ Enables the new profile management system, including profile lock and the new avatar menu UI.
+ </message>
+ <message name="IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_NAME" desc="Title for the flag to enable the account consistency between browser and cookie jar.">
+ Enable identity consistency between browser and cookie jar
+ </message>
+ <message name="IDS_FLAGS_ENABLE_ACCOUNT_CONSISTENCY_DESCRIPTION" desc="Description for the flag to enable the account consistency between browser and cookie jar.">
+ When enabled, the browser manages signing in and out of Google accounts.
+ </message>
+ </if>
+
<message name="IDS_FLAGS_ENABLE_FAST_USER_SWITCHING_NAME" desc="Title for the flag to enable fast user switching.">
Enable fast user switching in the avatar menu
</message>
« no previous file with comments | « no previous file | chrome/browser/about_flags.cc » ('j') | chrome/browser/about_flags.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698