Index: chrome/browser/ui/views/ime/ime_warning_bubble_view.cc |
diff --git a/chrome/browser/ui/views/ime/ime_warning_bubble_view.cc b/chrome/browser/ui/views/ime/ime_warning_bubble_view.cc |
index 5752d89933d37bfdc31eb7d6e821f6165476ab84..4a471c5e78c485204cf9837a9a08a941040ad25e 100644 |
--- a/chrome/browser/ui/views/ime/ime_warning_bubble_view.cc |
+++ b/chrome/browser/ui/views/ime/ime_warning_bubble_view.cc |
@@ -11,6 +11,7 @@ |
#include "chrome/browser/platform_util.h" |
#include "chrome/browser/ui/browser_list.h" |
#include "chrome/browser/ui/views/frame/browser_view.h" |
+#include "chrome/browser/ui/views/harmony/chrome_typography.h" |
#include "chrome/browser/ui/views/toolbar/app_menu_button.h" |
#include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
#include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
@@ -28,9 +29,8 @@ namespace { |
// The column width of the warning bubble. |
const int kColumnWidth = 285; |
-views::Label* CreateLabel(const base::string16& text, |
- const gfx::FontList& font) { |
- views::Label* label = new views::Label(text, font); |
+views::Label* CreateExtensionNameLabel(const base::string16& text) { |
+ views::Label* label = new views::Label(text, CONTEXT_BODY_TEXT_SMALL); |
label->SetMultiLine(true); |
label->SetHorizontalAlignment(gfx::ALIGN_LEFT); |
return label; |
@@ -172,13 +172,11 @@ void ImeWarningBubbleView::InitLayout() { |
main_cs->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0, |
views::GridLayout::FIXED, kColumnWidth, 0); |
- ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
layout->StartRow(0, cs_id); |
base::string16 extension_name = base::UTF8ToUTF16(extension_->name()); |
base::i18n::AdjustStringForLocaleDirection(&extension_name); |
- views::Label* warning = CreateLabel( |
- l10n_util::GetStringFUTF16(IDS_IME_API_ACTIVATED_WARNING, extension_name), |
- rb.GetFontList(ResourceBundle::BaseFont)); |
+ views::Label* warning = CreateExtensionNameLabel(l10n_util::GetStringFUTF16( |
+ IDS_IME_API_ACTIVATED_WARNING, extension_name)); |
layout->AddView(warning); |
layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); |