Sync Promo: Update sign into sync Wrench menu item

chrome/browser/ui/toolbar/wrench_menu_model.cc

 // Copyright (c) 2011 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/ui/toolbar/wrench_menu_model.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/command_line.h"
@@ skipping 227 matching lines @@
   return command_id != IDC_ZOOM_MINUS && command_id != IDC_ZOOM_PLUS;
 }
 
 bool WrenchMenuModel::IsItemForCommandIdDynamic(int command_id) const {
   return command_id == IDC_ZOOM_PERCENT_DISPLAY ||
 #if defined(OS_MACOSX)
          command_id == IDC_FULLSCREEN ||
 #endif
          command_id == IDC_SYNC_BOOKMARKS ||
          command_id == IDC_VIEW_BACKGROUND_PAGES ||
-         command_id == IDC_UPGRADE_DIALOG;
+         command_id == IDC_UPGRADE_DIALOG ||
+         command_id == IDC_SHOW_SYNC_SETUP;
 }
 
 string16 WrenchMenuModel::GetLabelForCommandId(int command_id) const {
   switch (command_id) {
     case IDC_SYNC_BOOKMARKS:
       return GetSyncMenuLabel();
     case IDC_ZOOM_PERCENT_DISPLAY:
       return zoom_label_;
 #if defined(OS_MACOSX)
     case IDC_FULLSCREEN: {
@@ skipping 13 matching lines @@
     case IDC_UPGRADE_DIALOG: {
 #if defined(OS_CHROMEOS)
       const string16 product_name =
           l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
 #else
       const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
 #endif
 
       return l10n_util::GetStringFUTF16(IDS_UPDATE_NOW, product_name);
     }
+    case IDC_SHOW_SYNC_SETUP: {
+      std::string username = browser_->GetProfile()->GetPrefs()->GetString(
+          prefs::kGoogleServicesUsername);
+      const string16 short_product_name =

[Peter Kasting, 2011/08/10 00:38:43]

Nit: Why use const on one string but not the other?  Be consistent.

[sail, 2011/08/10 00:55:33]

Done. Removed the const.

+          l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME);
+      if (username.empty()) {
+        return l10n_util::GetStringFUTF16(IDS_SHOW_SYNC_SETUP,
+                                          short_product_name);
+      } else {

[Peter Kasting, 2011/08/10 00:38:43]

Nit: No else after return.

[sail, 2011/08/10 00:55:33]

Done.

+        return l10n_util::GetStringFUTF16(IDS_SHOW_SYNC_SETUP_USERNAME,
+                                          short_product_name,
+                                          UTF8ToUTF16(username));
+      }
+    }
     default:
       NOTREACHED();
       return string16();
   }
 }
 
 bool WrenchMenuModel::GetIconForCommandId(int command_id,
                                           SkBitmap* icon) const {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   switch (command_id) {
@@ skipping 263 matching lines @@
         &enable_increment, &enable_decrement);
   }
   zoom_label_ = l10n_util::GetStringFUTF16(
       IDS_ZOOM_PERCENT, base::IntToString16(zoom_percent));
 }
 
 string16 WrenchMenuModel::GetSyncMenuLabel() const {
   return sync_ui_util::GetSyncMenuLabel(
       browser_->profile()->GetOriginalProfile()->GetProfileSyncService());
 }