ios/chrome/browser/ui/autofill/cells/status_item.mm - Issue 2602903002: Factor iOS native image loading into a utility function.

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: ios/chrome/browser/ui/autofill/cells/status_item.mm

Issue 2602903002: Factor iOS native image loading into a utility function. (Closed)

Patch Set: Fixed BUILD files. Created 4 years 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 | « ios/chrome/browser/ui/autofill/cells/cvc_item.mm ('k') | ios/chrome/browser/ui/autofill/cells/storage_switch_item.mm » ('j') | ios/chrome/browser/ui/uikit_ui_util.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/autofill/cells/status_item.mm

diff --git a/ios/chrome/browser/ui/autofill/cells/status_item.mm b/ios/chrome/browser/ui/autofill/cells/status_item.mm

index b2baa65e131fe011db99ed12d368a6e00ea3000c..a96644724394d252c6a96a221606ac09b6bc1d1e 100644

--- a/ios/chrome/browser/ui/autofill/cells/status_item.mm

+++ b/ios/chrome/browser/ui/autofill/cells/status_item.mm

@@ -6,11 +6,11 @@

#include "base/logging.h"

#import "ios/chrome/browser/ui/colors/MDCPalette+CrAdditions.h"

+#import "ios/chrome/browser/ui/uikit_ui_util.h"

#include "ios/chrome/grit/ios_theme_resources.h"

#import "ios/third_party/material_components_ios/src/components/ActivityIndicator/src/MaterialActivityIndicator.h"

#import "ios/third_party/material_components_ios/src/components/Palettes/src/MaterialPalettes.h"

#import "ios/third_party/material_roboto_font_loader_ios/src/src/MaterialRobotoFontLoader.h"

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

#if !defined(__has_feature) || !__has_feature(objc_arc)

#error "This file requires ARC support."

@@ -71,19 +71,17 @@ const CGFloat kHorizontalPadding = 16;

_activityIndicator.translatesAutoresizingMaskIntoConstraints = NO;

[verticalCenteringView addSubview:_activityIndicator];

- _verifiedImageView = [[UIImageView alloc] init];

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

// TODO(crbug.com/508925): Get rid of IDR_IOS_CHECKMARK, use a vector icon

// instead.

- _verifiedImageView.image =

- rb.GetNativeImageNamed(IDR_IOS_CHECKMARK).ToUIImage();

+ _verifiedImageView =

+ [[UIImageView alloc] initWithImage:NativeImage(IDR_IOS_CHECKMARK)];

_verifiedImageView.contentMode = UIViewContentModeScaleAspectFit;

_verifiedImageView.hidden = YES;

_verifiedImageView.translatesAutoresizingMaskIntoConstraints = NO;

[verticalCenteringView addSubview:_verifiedImageView];

- _errorImageView = [[UIImageView alloc] init];

- _errorImageView.image = rb.GetNativeImageNamed(IDR_IOS_ERROR).ToUIImage();

+ _errorImageView =

+ [[UIImageView alloc] initWithImage:NativeImage(IDR_IOS_ERROR)];

_errorImageView.contentMode = UIViewContentModeScaleAspectFit;

_errorImageView.hidden = YES;

_errorImageView.translatesAutoresizingMaskIntoConstraints = NO;