chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm - Issue 152343006: Clean-up: Replaces obsolete Font/FontList methods.

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/ui/cocoa/browser/password_generation_bubble_controller.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

« no previous file with comments | « chrome/browser/ui/cocoa/autofill/autofill_loading_shield_controller.mm ('k') | chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm

diff --git a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm

index 70653d4dd30823efcfb13ddf6d653e7f035f45fd..de00729ffcafd8ead294bf90b2bb390119a4b518 100644

--- a/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm

+++ b/chrome/browser/ui/cocoa/browser/password_generation_bubble_controller.mm

@@ -23,6 +23,7 @@

#import "ui/base/cocoa/tracking_area.h"

#include "ui/base/l10n/l10n_util_mac.h"

#include "ui/base/resource/resource_bundle.h"

+#include "ui/gfx/font_list.h"

namespace {

@@ -327,7 +328,7 @@ const CGFloat kIconSize = 26.0;

- (void)performLayout {

NSView* contentView = [[self window] contentView];

- ResourceBundle& rb = ResourceBundle::GetSharedInstance();

+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

textField_ = [[[PasswordGenerationTextField alloc]

initWithFrame:NSMakeRect(kBorderSize,

@@ -338,9 +339,9 @@ const CGFloat kIconSize = 26.0;

normalImage:rb.GetNativeImageNamed(IDR_RELOAD_DIMMED).ToNSImage()

hoverImage:rb.GetNativeImageNamed(IDR_RELOAD)

.ToNSImage()] autorelease];

- gfx::Font smallBoldFont =

- rb.GetFont(ResourceBundle::SmallFont).DeriveFont(0, gfx::Font::BOLD);

- [textField_ setFont:smallBoldFont.GetNativeFont()];

+ const gfx::FontList& smallBoldFont =

+ rb.GetFontList(ui::ResourceBundle::SmallBoldFont);

+ [textField_ setFont:smallBoldFont.GetPrimaryFont().GetNativeFont()];

[textField_

setStringValue:base::SysUTF8ToNSString(passwordGenerator_->Generate())];

[textField_ setDelegate:self];