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

Unified Diff: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

Issue 152343006: Clean-up: Replaces obsolete Font/FontList methods. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced. Created 6 years, 10 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
Index: chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
index 95bacdd45de4ba73ed3315ff9cd0c2efef2eb9f5..ac87f9e73b3c834bf689fad11d4c21aa1dfa0e1e 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm
@@ -28,7 +28,8 @@
#include "ui/base/clipboard/clipboard.h"
#import "ui/base/cocoa/cocoa_event_utils.h"
#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/rect.h"
+#include "ui/gfx/font_list.h"
+#include "ui/gfx/geometry/rect.h"
using content::WebContents;
@@ -124,7 +125,7 @@ NSRange ComponentToNSRange(const url_parse::Component& component) {
// static
NSImage* OmniboxViewMac::ImageForResource(int resource_id) {
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
return rb.GetNativeImageNamed(resource_id).ToNSImage();
}
@@ -942,8 +943,9 @@ void OmniboxViewMac::FocusLocation(bool select_all) {
// static
NSFont* OmniboxViewMac::GetFieldFont() {
// This value should be kept in sync with InstantPage::InitializeFonts.
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- return rb.GetFont(ResourceBundle::BaseFont).DeriveFont(1).GetNativeFont();
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+ return rb.GetFontList(ui::ResourceBundle::BaseFont).DeriveWithSizeDelta(1)
+ .GetPrimaryFont().GetNativeFont();
}
int OmniboxViewMac::GetOmniboxTextLength() const {
« no previous file with comments | « chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm ('k') | chrome/browser/ui/gtk/tabs/tab_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698