Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(502)

Unified Diff: ash/system/chromeos/network/tray_sms.cc

Issue 140693017: Clean-up: Replaces obsolete Font/FontList methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/chromeos/audio/tray_audio.cc ('k') | ash/system/date/date_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() -
« no previous file with comments | « ash/system/chromeos/audio/tray_audio.cc ('k') | ash/system/date/date_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698