Clean-up: Replaces obsolete Font/FontList methods.

ash/system/chromeos/network/tray_sms.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/chromeos/network/tray_sms.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/fixed_sized_scroll_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_bubble.h"
@@ skipping 41 matching lines @@
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 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();
   }
 
   virtual ~SmsDefaultView() {}
 
   void Update() {
     int message_count = static_cast<TraySms*>(owner())->messages().GetSize();
     base::string16 label = l10n_util::GetStringFUTF16(
         IDS_ASH_STATUS_TRAY_SMS_MESSAGES, base::IntToString16(message_count));
@@ skipping 16 matching lines @@
 
   SmsMessageView(TraySms* owner,
                  ViewType view_type,
                  size_t index,
                  const std::string& number,
                  const std::string& message)
       : owner_(owner),
         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);
     message_label_->SetMultiLine(true);
 
     if (view_type == VIEW_DETAILED)
       LayoutDetailedView();
     else
       LayoutNotificationView();
   }
 
   virtual ~SmsMessageView() {
   }
 
   // Overridden from ButtonListener.
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE {
     owner_->RemoveMessage(index_);
     owner_->Update(false);
   }
 
  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() -
             (kNotificationIconWidth + kTrayPopupPaddingHorizontal * 2);
     message_label_->SizeToFit(msg_width);
 
     views::GridLayout* layout = new views::GridLayout(this);
     SetLayoutManager(layout);
 
     views::ColumnSet* columns = layout->AddColumnSet(0);
@@ skipping 272 matching lines @@
       if (GetLatestMessage(&index, &number, &text))
         notification_->Update(index, number, text);
     } else if (notify) {
       ShowNotificationView();
     }
   }
 }
 
 }  // namespace internal
 }  // namespace ash