Commit 18502e69 authored by Marc Treib's avatar Marc Treib Committed by Commit Bot

Cleanup: Remove long-obsolete ChromeDashboard trial

All it did was change the label for the Sync dashboard link. This was
for a feature called "Chrome Away" which has long been abandoned.

Bug: 402615
Change-Id: I6e4ab8973eed17aaeed631831b4145566ec3f86a
Reviewed-on: https://chromium-review.googlesource.com/1047225Reviewed-by: default avatarGayane Petrosyan <gayane@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#556468}
parent d23d886b
...@@ -8023,9 +8023,6 @@ Please help our engineers fix this problem. Tell us what happened right before y ...@@ -8023,9 +8023,6 @@ Please help our engineers fix this problem. Tell us what happened right before y
<message name="IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK" desc="The message that appears in the options dialog indicating that account is syncing along with a link to manage their data (where supported, or not possible through the application)"> <message name="IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK" desc="The message that appears in the options dialog indicating that account is syncing along with a link to manage their data (where supported, or not possible through the application)">
Manage your synced data on <ph name="BEGIN_LINK">&lt;a href="$1" target=&quot;_blank&quot;&gt;<ex>&lt;a href="$1" target=&quot;_blank&quot;&gt;</ex></ph>Google Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>. Manage your synced data on <ph name="BEGIN_LINK">&lt;a href="$1" target=&quot;_blank&quot;&gt;<ex>&lt;a href="$1" target=&quot;_blank&quot;&gt;</ex></ph>Google Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
</message> </message>
<message name="IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK_NEW" desc="The message that appears in the options dialog indicating that account is syncing along with a link to manage their data (where supported, or not possible through the application)">
Manage your synced data and devices on <ph name="BEGIN_LINK">&lt;a href="$1" target=&quot;_blank&quot;&gt;<ex>&lt;a href="$1" target=&quot;_blank&quot;&gt;</ex></ph>Chrome Dashboard<ph name="END_LINK">&lt;/a&gt;<ex>&lt;/a&gt;</ex></ph>.
</message>
<message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync."> <message name="IDS_SYNC_AUTHENTICATING_LABEL" desc="Label to display while the user is being authenticated to use sync.">
Authenticating... Authenticating...
</message> </message>
......
...@@ -55,12 +55,6 @@ namespace sync_ui_util { ...@@ -55,12 +55,6 @@ namespace sync_ui_util {
namespace { namespace {
bool IsChromeDashboardEnabled() {
const std::string group_name =
base::FieldTrialList::FindFullName("ChromeDashboard");
return group_name == "Enabled";
}
// Returns the message that should be displayed when the user is authenticated // Returns the message that should be displayed when the user is authenticated
// and can connect to the sync server. If the user hasn't yet authenticated, an // and can connect to the sync server. If the user hasn't yet authenticated, an
// empty string is returned. // empty string is returned.
...@@ -86,11 +80,6 @@ base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service, ...@@ -86,11 +80,6 @@ base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
sync_everything ? IDS_SYNC_ACCOUNT_SYNCING sync_everything ? IDS_SYNC_ACCOUNT_SYNCING
: IDS_SYNC_ACCOUNT_SYNCING_CUSTOM_DATA_TYPES); : IDS_SYNC_ACCOUNT_SYNCING_CUSTOM_DATA_TYPES);
case WITH_HTML: case WITH_HTML:
if (IsChromeDashboardEnabled()) {
return l10n_util::GetStringFUTF16(
IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK_NEW,
base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
}
return l10n_util::GetStringFUTF16( return l10n_util::GetStringFUTF16(
IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK, IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK,
base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL)); base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
......
...@@ -766,24 +766,6 @@ ...@@ -766,24 +766,6 @@
] ]
} }
], ],
"ChromeDashboard": [
{
"platforms": [
"chromeos",
"linux",
"mac",
"win"
],
"experiments": [
{
"name": "Enabled"
},
{
"name": "Default"
}
]
}
],
"ChromeModernDesign": [ "ChromeModernDesign": [
{ {
"platforms": [ "platforms": [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment