chrome/browser/browser_main.cc - Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/browser_main.cc

Issue 3083022: Rework gfx::Font by moving platform-specific code into inner classes.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 4 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/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm ('k') | chrome/browser/chromeos/options/internet_page_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/browser_main.cc

===================================================================

--- chrome/browser/browser_main.cc (revision 55911)

+++ chrome/browser/browser_main.cc (working copy)

@@ -123,6 +123,7 @@

#include "chrome/installer/util/install_util.h"

#include "chrome/installer/util/shell_util.h"

#include "chrome/installer/util/version.h"

+#include "gfx/platform_font_win.h"

#include "net/base/net_util.h"

#include "net/base/sdch_manager.h"

#include "printing/printed_document.h"

@@ -706,8 +707,8 @@

views::ViewsDelegate::views_delegate = new ChromeViewsDelegate;

#if defined(OS_WIN)

- gfx::Font::adjust_font_callback = &AdjustUIFont;

- gfx::Font::get_minimum_font_size_callback = &GetMinimumFontSize;

+ gfx::PlatformFontWin::adjust_font_callback = &AdjustUIFont;

+ gfx::PlatformFontWin::get_minimum_font_size_callback = &GetMinimumFontSize;

// Init common control sex.

INITCOMMONCONTROLSEX config;