Make the strings in the ash uber tray translatable.

ash/system/tray_user.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 "ash/system/tray_user.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "base/utf_string_conversions.h"
-#include "grit/ui_resources.h"
+#include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 namespace {
 
 // A custom textbutton with some extra vertical padding, and custom border,
 // alignment and hover-effects.
 class TrayButton : public views::TextButton {
  public:
-  TrayButton(views::ButtonListener* listener, std::string text)
-      : views::TextButton(listener, ASCIIToUTF16(text)),
+  TrayButton(views::ButtonListener* listener, const string16& text)
+      : views::TextButton(listener, text),
         hover_(false),
         hover_bg_(views::Background::CreateSolidBackground(SkColorSetARGB(
                10, 0, 0, 0))) {
     set_alignment(ALIGN_CENTER);
   }
 
  private:
   // Overridden from views::View.
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     gfx::Size size = views::TextButton::GetPreferredSize();
@@ skipping 46 matching lines @@
     user->AddChildView(email_);
 
     AddChildView(user);
 
     views::View* button_container = new views::View;
     views::BoxLayout *layout = new
         views::BoxLayout(views::BoxLayout::kHorizontal, 0, 5, 0);
     layout->set_spread_blank_space(true);
     button_container->SetLayoutManager(layout);
 
-    shutdown_ = new TrayButton(this, std::string("Shut down"));
-    signout_ = new TrayButton(this, std::string("Sign out"));
-    lock_ = new TrayButton(this, std::string("Lock"));
+    ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
+
+    shutdown_ = new TrayButton(this, bundle.GetLocalizedString(
+          IDS_ASH_STATUS_TRAY_SHUT_DOWN));
+    signout_ = new TrayButton(this, bundle.GetLocalizedString(
+          IDS_ASH_STATUS_TRAY_SIGN_OUT));
+    lock_ = new TrayButton(this, bundle.GetLocalizedString(
+          IDS_ASH_STATUS_TRAY_LOCK));
     button_container->AddChildView(shutdown_);
     button_container->AddChildView(signout_);
     button_container->AddChildView(lock_);
 
     shutdown_->set_border(NULL);
     signout_->set_border(views::Border::CreateSolidSidedBorder(
           0, 1, 0, 1, SkColorSetARGB(25, 0, 0, 0)));
     lock_->set_border(NULL);
 
     AddChildView(button_container);
@@ skipping 52 matching lines @@
 }
 
 void TrayUser::DestroyDefaultView() {
 }
 
 void TrayUser::DestroyDetailedView() {
 }
 
 }  // namespace internal
 }  // namespace ash