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

Unified Diff: chrome/views/window/dialog_client_view.cc

Issue 62064: UI font localization part 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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 | « chrome/views/window/dialog_client_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/views/window/dialog_client_view.cc
===================================================================
--- chrome/views/window/dialog_client_view.cc (revision 13518)
+++ chrome/views/window/dialog_client_view.cc (working copy)
@@ -78,7 +78,7 @@
} // namespace
// static
-ChromeFont DialogClientView::dialog_button_font_;
+ChromeFont* DialogClientView::dialog_button_font_ = NULL;
static const int kDialogMinButtonWidth = 75;
static const int kDialogButtonLabelSpacing = 16;
static const int kDialogButtonContentSpacing = 5;
@@ -353,7 +353,7 @@
DialogDelegate* dd = GetDialogDelegate();
std::wstring button_label = dd->GetDialogButtonLabel(
static_cast<DialogDelegate::DialogButton>(button));
- int string_width = dialog_button_font_.GetStringWidth(button_label);
+ int string_width = dialog_button_font_->GetStringWidth(button_label);
return std::max(string_width + kDialogButtonLabelSpacing,
kDialogMinButtonWidth);
}
@@ -431,7 +431,7 @@
static bool initialized = false;
if (!initialized) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- dialog_button_font_ = rb.GetFont(ResourceBundle::BaseFont);
+ dialog_button_font_ = new ChromeFont(rb.GetFont(ResourceBundle::BaseFont));
initialized = true;
}
}
« no previous file with comments | « chrome/views/window/dialog_client_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698