Chromium Code Reviews| Index: chrome/browser/ui/views/frame/browser_frame.cc |
| diff --git a/chrome/browser/ui/views/frame/browser_frame.cc b/chrome/browser/ui/views/frame/browser_frame.cc |
| index 78b56a8a78324f48536dbc0de47e440a2ecf1269..e87974e060b9c8148ee44338905ac75ec06c1541 100644 |
| --- a/chrome/browser/ui/views/frame/browser_frame.cc |
| +++ b/chrome/browser/ui/views/frame/browser_frame.cc |
| @@ -27,12 +27,14 @@ |
| #include "ui/aura/window.h" |
| #include "ui/base/hit_test.h" |
| #include "ui/base/theme_provider.h" |
| +#include "ui/gfx/font.h" |
| #include "ui/gfx/screen.h" |
| #include "ui/views/controls/menu/menu_runner.h" |
| #include "ui/views/widget/native_widget.h" |
| #if defined(OS_WIN) && !defined(USE_AURA) |
| #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" |
| +#include "ui/views/widget/native_widget_win.cc" |
|
scottmg
2013/10/04 22:44:56
Is this really supposed to be .cc?? This breaks th
|
| #endif |
| #if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
| @@ -62,6 +64,17 @@ BrowserFrame::BrowserFrame(BrowserView* browser_view) |
| BrowserFrame::~BrowserFrame() { |
| } |
| +// static |
| +const gfx::Font& BrowserFrame::GetTitleFont() { |
| +#if !defined(OS_WIN) || defined(USE_AURA) |
| + static gfx::Font* title_font = new gfx::Font; |
| +#else |
| + static gfx::Font* title_font = |
| + new gfx::Font(views::NativeWidgetWin::GetWindowTitleFont()); |
| +#endif |
| + return *title_font; |
| +} |
| + |
| void BrowserFrame::InitBrowserFrame() { |
| native_browser_frame_ = |
| NativeBrowserFrameFactory::CreateNativeBrowserFrame(this, browser_view_); |