| OLD | NEW | 
|   1 // Copyright 2013 The Chromium Authors. All rights reserved. |   1 // Copyright 2013 The Chromium Authors. All rights reserved. | 
|   2 // Use of this source code is governed by a BSD-style license that can be |   2 // Use of this source code is governed by a BSD-style license that can be | 
|   3 // found in the LICENSE file. |   3 // found in the LICENSE file. | 
|   4  |   4  | 
|   5 #include "ui/gfx/text_utils.h" |   5 #include "ui/gfx/text_utils.h" | 
|   6  |   6  | 
|   7 #import <UIKit/UIKit.h> |   7 #import <UIKit/UIKit.h> | 
|   8  |   8  | 
|   9 #include <cmath> |  | 
|  10  |  | 
|  11 #include "base/strings/sys_string_conversions.h" |   9 #include "base/strings/sys_string_conversions.h" | 
|  12 #include "ui/gfx/font_list.h" |  10 #include "ui/gfx/font_list.h" | 
|  13  |  11  | 
|  14 namespace gfx { |  12 namespace gfx { | 
|  15  |  13  | 
|  16 int GetStringWidth(const base::string16& text, const FontList& font_list) { |  14 float GetStringWidth(const base::string16& text, const FontList& font_list) { | 
|  17   NSString* ns_text = base::SysUTF16ToNSString(text); |  15   NSString* ns_text = base::SysUTF16ToNSString(text); | 
|  18   NativeFont native_font = font_list.GetPrimaryFont().GetNativeFont(); |  16   NativeFont native_font = font_list.GetPrimaryFont().GetNativeFont(); | 
|  19   return std::ceil([ns_text sizeWithFont:native_font].width); |  17   return [ns_text sizeWithFont:native_font].width; | 
|  20 } |  18 } | 
|  21  |  19  | 
|  22 }  // namespace gfx |  20 }  // namespace gfx | 
| OLD | NEW |