diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 16:03:17 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 16:03:17 +0000 |
| commit | d9ab3f57d3b4b2368adf22a409d820a69d497962 (patch) | |
| tree | 4a25e9d1289e35617e239103f8a9a3ce27af01fe /ash/system/settings | |
| parent | 020dc9b4840ef1e702ca0a1f8575abd042b2dd27 (diff) | |
| download | chromium_src-d9ab3f57d3b4b2368adf22a409d820a69d497962.zip chromium_src-d9ab3f57d3b4b2368adf22a409d820a69d497962.tar.gz chromium_src-d9ab3f57d3b4b2368adf22a409d820a69d497962.tar.bz2 | |
Make the strings in the ash uber tray translatable.
BUG=110130
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9572010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/settings')
| -rw-r--r-- | ash/system/settings/tray_settings.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc index 3281fa0..4a55c8b 100644 --- a/ash/system/settings/tray_settings.cc +++ b/ash/system/settings/tray_settings.cc @@ -8,6 +8,7 @@ #include "ash/system/tray/system_tray_delegate.h" #include "base/logging.h" #include "base/utf_string_conversions.h" +#include "grit/ash_strings.h" #include "grit/ui_resources.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/base/resource/resource_bundle.h" @@ -26,12 +27,14 @@ class SettingsView : public views::View { SetLayoutManager(new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 3)); + ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance(); views::ImageView* icon = new views::ImageView; - icon->SetImage(ui::ResourceBundle::GetSharedInstance(). - GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToSkBitmap()); + icon->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS). + ToSkBitmap()); AddChildView(icon); - label_ = new views::Label(ASCIIToUTF16("Help and Settings")); + label_ = new views::Label(bundle.GetLocalizedString( + IDS_ASH_STATUS_TRAY_HELP_AND_SETTINGS)); AddChildView(label_); } |