| Index: ui/gfx/platform_font_mac.mm
|
| diff --git a/ui/gfx/platform_font_mac.mm b/ui/gfx/platform_font_mac.mm
|
| index eff0c0f0c01e71859255f7c368763fa607ce45c4..bf0c0bd54acaaf13d5928942cd8a169b69a47d63 100644
|
| --- a/ui/gfx/platform_font_mac.mm
|
| +++ b/ui/gfx/platform_font_mac.mm
|
| @@ -7,7 +7,7 @@
|
| #include <Cocoa/Cocoa.h>
|
|
|
| #include "base/basictypes.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "base/strings/sys_string_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "ui/gfx/canvas.h"
|
| @@ -124,7 +124,7 @@ void PlatformFontMac::InitWithNameSizeAndStyle(const std::string& font_name,
|
|
|
| void PlatformFontMac::CalculateMetrics() {
|
| NSFont* font = GetNativeFont();
|
| - scoped_nsobject<NSLayoutManager> layout_manager(
|
| + base::scoped_nsobject<NSLayoutManager> layout_manager(
|
| [[NSLayoutManager alloc] init]);
|
| height_ = [layout_manager defaultLineHeightForFont:font];
|
| ascent_ = [font ascender];
|
|
|