| Index: ash/system/chromeos/network/tray_sms.cc
|
| diff --git a/ash/system/chromeos/network/tray_sms.cc b/ash/system/chromeos/network/tray_sms.cc
|
| index fc76c09ba4d7143c7fd39f7a99099ea8488e6a34..f323100cb9cc8d4a1fcf51882973dc69ee5799a4 100644
|
| --- a/ash/system/chromeos/network/tray_sms.cc
|
| +++ b/ash/system/chromeos/network/tray_sms.cc
|
| @@ -59,7 +59,7 @@ class TraySms::SmsDefaultView : public TrayItemMore {
|
| public:
|
| explicit SmsDefaultView(TraySms* owner)
|
| : TrayItemMore(owner, true) {
|
| - SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| + SetImage(ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| IDR_AURA_UBER_TRAY_SMS));
|
| Update();
|
| }
|
| @@ -96,11 +96,10 @@ class TraySms::SmsMessageView : public views::View,
|
| index_(index) {
|
| number_label_ = new views::Label(
|
| l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_SMS_NUMBER,
|
| - base::UTF8ToUTF16(number)));
|
| + base::UTF8ToUTF16(number)),
|
| + ui::ResourceBundle::GetSharedInstance().GetFontList(
|
| + ui::ResourceBundle::BoldFont));
|
| number_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
|
| - number_label_->SetFontList(
|
| - number_label_->font_list().DeriveFontListWithSizeDeltaAndStyle(
|
| - 0, gfx::Font::BOLD));
|
|
|
| message_label_ = new views::Label(base::UTF8ToUTF16(message));
|
| message_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
|
| @@ -125,8 +124,9 @@ class TraySms::SmsMessageView : public views::View,
|
| private:
|
| void LayoutDetailedView() {
|
| views::ImageButton* close_button = new views::ImageButton(this);
|
| - close_button->SetImage(views::CustomButton::STATE_NORMAL,
|
| - ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| + close_button->SetImage(
|
| + views::CustomButton::STATE_NORMAL,
|
| + ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
|
| IDR_AURA_WINDOW_CLOSE));
|
| const int msg_width = owner_->system_tray()->GetSystemBubble()->
|
| bubble_view()->GetPreferredSize().width() -
|
|
|