Enable new sync URL to link to Chrome Away

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_ui_util.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
@@ skipping 25 matching lines @@
 #if defined(OS_CHROMEOS)
 #include "components/user_manager/user_manager.h"
 #endif  // defined(OS_CHROMEOS)
 
 typedef GoogleServiceAuthError AuthError;
 
 namespace sync_ui_util {
 
 namespace {
 
+bool IsChromeAwayFromChromeEnabled() {

[Nicolas Zea, 2015/03/05 21:41:35]

nit: use IsChromeDashboardEnabled instead

+  const std::string group_name =
+      base::FieldTrialList::FindFullName("ChromeDashboard");

[Nicolas Zea, 2015/03/05 21:41:35]

It's good style to #include any libraries you depend on directly,
"field_trial.h" in this case (include what you use)

+  return group_name == "Enabled";
+}
+
 // 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
 // empty string is returned.
 base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
                                          const SigninManagerBase& signin,
                                          StatusLabelStyle style) {
   std::string user_display_name = signin.GetAuthenticatedUsername();
 
 #if defined(OS_CHROMEOS)
   if (user_manager::UserManager::IsInitialized()) {
@@ skipping 25 matching lines @@
 
   DCHECK(!user_name.empty());
 
   // Message may also carry additional advice with an HTML link, if acceptable.
   switch (style) {
     case PLAIN_TEXT:
       return l10n_util::GetStringFUTF16(
           IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
           user_name);
     case WITH_HTML:
+      if (IsChromeAwayFromChromeEnabled()) {
+        return l10n_util::GetStringFUTF16(
+            IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK_NEW,
+            user_name,
+            base::ASCIIToUTF16(chrome::kSyncChromeDashboardURL));
+      }
       return l10n_util::GetStringFUTF16(
           IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK,
           user_name,
           base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
@@ skipping 275 matching lines @@
 base::string16 ConstructTime(int64 time_in_int) {
   base::Time time = base::Time::FromInternalValue(time_in_int);
 
   // If time is null the format function returns a time in 1969.
   if (time.is_null())
     return base::string16();
   return base::TimeFormatFriendlyDateAndTime(time);
 }
 
 }  // namespace sync_ui_util