chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm - Issue 2727233003: Uses child views in Autofill Popup so we can trigger

Unified Diff: chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm

Issue 2727233003: Uses child views in Autofill Popup so we can trigger (Closed)

Patch Set: Switches from size_t to int when we are not referring to size of an object. Created 3 years, 9 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

« chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.mm ('K') | « chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.h ('k') | chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm

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

index e95bea9dbb9910071305acea2af39d3c9a7c0df9..67dba9831228baf93494f6ce824d4f8db777ff17 100644

--- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm

+++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm

@@ -42,7 +42,7 @@ using autofill::AutofillPopupLayoutModel;

// if the row requires it -- such as for credit cards.

- (void)drawSuggestionWithName:(NSString*)name

subtext:(NSString*)subtext

- index:(size_t)index

+ index:(int)index

groby-ooo-7-16 2017/03/20 20:42:55 If we absolutely must change to int (and if we kee

csashi 2017/03/20 21:41:51 Done.

bounds:(NSRect)bounds

selected:(BOOL)isSelected

textYOffset:(CGFloat)textYOffset;

@@ -56,24 +56,24 @@ using autofill::AutofillPopupLayoutModel;

// Returns the x value of right border of the widget.

- (CGFloat)drawName:(NSString*)name

atX:(CGFloat)x

- index:(size_t)index

+ index:(int)index

rightAlign:(BOOL)rightAlign

bounds:(NSRect)bounds

textYOffset:(CGFloat)textYOffset;

-- (CGFloat)drawIconAtIndex:(size_t)index

+- (CGFloat)drawIconAtIndex:(int)index

atX:(CGFloat)x

rightAlign:(BOOL)rightAlign

bounds:(NSRect)bounds;

- (CGFloat)drawSubtext:(NSString*)subtext

atX:(CGFloat)x

- index:(size_t)index

+ index:(int)index

rightAlign:(BOOL)rightAlign

bounds:(NSRect)bounds

textYOffset:(CGFloat)textYOffset;

// Returns the icon for the row with the given |index|, or |nil| if there is

// none.

-- (NSImage*)iconAtIndex:(size_t)index;

+- (NSImage*)iconAtIndex:(int)index;

@end

@@ -109,7 +109,7 @@ using autofill::AutofillPopupLayoutModel;

[self drawBackgroundAndBorder];

- for (size_t i = 0; i < controller_->GetLineCount(); ++i) {

+ for (int i = 0; i < controller_->GetLineCount(); ++i) {

// Skip rows outside of the dirty rect.

NSRect rowBounds = NSRectFromCGRect(delegate_->GetRowBounds(i).ToCGRect());

if (!NSIntersectsRect(rowBounds, dirtyRect))

@@ -126,7 +126,8 @@ using autofill::AutofillPopupLayoutModel;

NSString* value = SysUTF16ToNSString(controller_->GetElidedValueAt(i));

NSString* label = SysUTF16ToNSString(controller_->GetElidedLabelAt(i));

- BOOL isSelected = static_cast<int>(i) == controller_->selected_line();

+ BOOL isSelected =

+ controller_->selected_line() && i == *controller_->selected_line();

[self drawSuggestionWithName:value

subtext:label

index:i

@@ -146,7 +147,7 @@ using autofill::AutofillPopupLayoutModel;

[super delegateDestroyed];

}

-- (void)invalidateRow:(size_t)row {

+- (void)invalidateRow:(int)row {

NSRect dirty_rect = NSRectFromCGRect(delegate_->GetRowBounds(row).ToCGRect());

[self setNeedsDisplayInRect:dirty_rect];

}

@@ -156,7 +157,7 @@ using autofill::AutofillPopupLayoutModel;

- (void)drawSuggestionWithName:(NSString*)name

subtext:(NSString*)subtext

- index:(size_t)index

+ index:(int)index

bounds:(NSRect)bounds

selected:(BOOL)isSelected

textYOffset:(CGFloat)textYOffset {

@@ -211,7 +212,7 @@ using autofill::AutofillPopupLayoutModel;

- (CGFloat)drawName:(NSString*)name

atX:(CGFloat)x

- index:(size_t)index

+ index:(int)index

rightAlign:(BOOL)rightAlign

bounds:(NSRect)bounds

textYOffset:(CGFloat)textYOffset {

@@ -236,7 +237,7 @@ using autofill::AutofillPopupLayoutModel;

return x;

}

-- (CGFloat)drawIconAtIndex:(size_t)index

+- (CGFloat)drawIconAtIndex:(int)index

atX:(CGFloat)x

rightAlign:(BOOL)rightAlign

bounds:(NSRect)bounds {

@@ -260,7 +261,7 @@ using autofill::AutofillPopupLayoutModel;

- (CGFloat)drawSubtext:(NSString*)subtext

atX:(CGFloat)x

- index:(size_t)index

+ index:(int)index

rightAlign:(BOOL)rightAlign

bounds:(NSRect)bounds

textYOffset:(CGFloat)textYOffset {

@@ -281,7 +282,7 @@ using autofill::AutofillPopupLayoutModel;

return x;

}

-- (NSImage*)iconAtIndex:(size_t)index {

+- (NSImage*)iconAtIndex:(int)index {

const int kHttpWarningIconWidth = 16;

const base::string16& icon = controller_->GetSuggestionAt(index).icon;

if (icon.empty())