Unify ChromeOS/non-ChromeOS strings into one label on sync_ui_util

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/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 34 matching lines @@
 void GetStatusLabelsForAuthError(const AuthError& auth_error,
                                  const ProfileSyncService& service,
                                  string16* status_label,
                                  string16* link_label,
                                  string16* global_error_menu_label,
                                  string16* global_error_bubble_message,
                                  string16* global_error_bubble_accept_label) {
   string16 username = UTF8ToUTF16(service.profile()->GetPrefs()->GetString(
       prefs::kGoogleServicesUsername));
   string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
-  // TODO(altimofeev): get rid of "if def" construction: use the same IDS
-  // names. The reason the suffix was used is that strings were submitted
-  // before the actual change.
-#if defined(OS_CHROMEOS)
-  if (link_label)
-    link_label->assign(
-        l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL_CHROMEOS));
-#else
   if (link_label)
     link_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL));
-#endif
 
   switch (auth_error.state()) {
     case AuthError::INVALID_GAIA_CREDENTIALS:
     case AuthError::ACCOUNT_DELETED:
     case AuthError::ACCOUNT_DISABLED:
       // If the user name is empty then the first login failed, otherwise the
       // credentials are out-of-date.
       if (username.empty()) {
         if (status_label) {
           status_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_INVALID_USER_CREDENTIALS));
         }
       } else {
         if (status_label) {
           status_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_LOGIN_INFO_OUT_OF_DATE));
         }
         if (global_error_menu_label) {
-          // TODO(altimofeev): get rid of "if def" construction: use the same
-          // IDS names. The reason the suffix was used is that strings were
-          // submitted before the actual change.
-#if defined(OS_CHROMEOS)
-          global_error_menu_label->assign(l10n_util::GetStringUTF16(
-              IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM_CHROMEOS));
-#else
           global_error_menu_label->assign(l10n_util::GetStringUTF16(
               IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM));
-#endif
         }
         if (global_error_bubble_message) {
           global_error_bubble_message->assign(l10n_util::GetStringFUTF16(
               IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_MESSAGE, product_name));
         }
         if (global_error_bubble_accept_label) {
-          // TODO(altimofeev): get rid of "if def" construction: use the same
-          // IDS names. The reason the suffix was used is that strings were
-          // submitted before the actual change.
-#if defined(OS_CHROMEOS)
-          global_error_bubble_accept_label->assign(l10n_util::GetStringUTF16(
-              IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT_CHROMEOS));
-#else
           global_error_bubble_accept_label->assign(l10n_util::GetStringUTF16(
               IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT));
-#endif
         }
       }
       break;
     case AuthError::SERVICE_UNAVAILABLE:
       if (status_label) {
         status_label->assign(
             l10n_util::GetStringUTF16(IDS_SYNC_SERVICE_UNAVAILABLE));
       }
       if (link_label)
         link_label->clear();
@@ skipping 699 matching lines @@
     }
   } else {
     version_modifier = " " + version_modifier;
   }
   return chrome_version.Name() + " " + chrome_version.OSType() + " " +
       chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +
       version_modifier;
 }
 
 }  // namespace sync_ui_util