diff options
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/DEPS | 1 | ||||
| -rw-r--r-- | printing/print_settings_initializer.cc | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/printing/DEPS b/printing/DEPS index 9c706cd..00c20e2 100644 --- a/printing/DEPS +++ b/printing/DEPS @@ -4,6 +4,7 @@ include_rules = [ "+third_party/icu/source/i18n/unicode", "+third_party/skia", "+ui/aura", + "+ui/base/resource", "+ui/base/text", "+ui/gfx", "+win8/util", diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc index 49a7bd8..37e5a64 100644 --- a/printing/print_settings_initializer.cc +++ b/printing/print_settings_initializer.cc @@ -16,7 +16,8 @@ #include "printing/print_job_constants.h" #include "printing/print_settings.h" #include "printing/units.h" -#include "ui/gfx/font.h" +#include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/font_list.h" #include "ui/gfx/text_elider.h" #include "url/gurl.h" @@ -44,7 +45,11 @@ void PrintSettingsInitializer::InitHeaderFooterStrings( print_settings->date = date; print_settings->title = title; - print_settings->url = gfx::ElideUrl(GURL(url), gfx::Font(), 0, std::string()); + const gfx::FontList& default_fonts = + ui::ResourceBundle::GetSharedInstance().GetFontList( + ui::ResourceBundle::BaseFont); + print_settings->url = gfx::ElideUrl(GURL(url), default_fonts, 0, + std::string()); } } // namespace printing |