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

Unified Diff: chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm

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.mm ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm
===================================================================
--- chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm (revision 55911)
+++ chrome/browser/autocomplete/autocomplete_popup_view_mac_unittest.mm (working copy)
@@ -24,7 +24,7 @@
// These are here because there is no autorelease pool for the
// constructor.
color_ = [NSColor blackColor];
- font_ = gfx::Font::CreateFont(
+ font_ = gfx::Font(
base::SysNSStringToWide([[NSFont userFontOfSize:12] fontName]), 12);
}
@@ -427,7 +427,7 @@
const float kNarrow = 20.0;
NSDictionary* attributes =
- [NSDictionary dictionaryWithObject:font_.nativeFont()
+ [NSDictionary dictionaryWithObject:font_.GetNativeFont()
forKey:NSFontAttributeName];
scoped_nsobject<NSMutableAttributedString> as(
[[NSMutableAttributedString alloc] initWithString:contents
@@ -476,7 +476,7 @@
// Figure out the width of the contents.
NSDictionary* attributes =
- [NSDictionary dictionaryWithObject:font_.nativeFont()
+ [NSDictionary dictionaryWithObject:font_.GetNativeFont()
forKey:NSFontAttributeName];
const float contentsWidth = [contents sizeWithAttributes:attributes].width;
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_popup_view_mac.mm ('k') | chrome/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698