ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm - Issue 2588263003: Reland: Remove Finch support for PasswordBranding

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/settings/save_passwords_collection_view_controller.mm

Issue 2588263003: Reland: Remove Finch support for PasswordBranding (Closed)

Patch Set: Rebased only 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/passwords/password_controller.mm ('k') | ios/chrome/browser/ui/settings/settings_collection_view_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm

diff --git a/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm b/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm

index 05648dba3adcec452ce1b768bd8385583c90accf..765c944c4a529f6126e7684bf4e0d33e53001f7d 100644

--- a/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm

+++ b/ios/chrome/browser/ui/settings/save_passwords_collection_view_controller.mm

@@ -17,11 +17,9 @@

#include "base/strings/sys_string_conversions.h"

#include "base/strings/utf_string_conversions.h"

#include "components/autofill/core/common/password_form.h"

-#include "components/browser_sync/profile_sync_service.h"

#include "components/google/core/browser/google_util.h"

#include "components/keyed_service/core/service_access_type.h"

#include "components/password_manager/core/browser/affiliation_utils.h"

-#include "components/password_manager/core/browser/password_bubble_experiment.h"

#include "components/password_manager/core/browser/password_manager_constants.h"

#include "components/password_manager/core/browser/password_store.h"

#include "components/password_manager/core/browser/password_store_consumer.h"

@@ -34,7 +32,6 @@

#include "ios/chrome/browser/browser_state/chrome_browser_state.h"

#include "ios/chrome/browser/experimental_flags.h"

#include "ios/chrome/browser/passwords/ios_chrome_password_store_factory.h"

-#include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h"

#import "ios/chrome/browser/ui/collection_view/cells/MDCCollectionViewCell+Chrome.h"

#import "ios/chrome/browser/ui/collection_view/cells/collection_view_footer_item.h"

#import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"

@@ -183,13 +180,7 @@ void SavePasswordsConsumer::OnGetPasswordStoreResults(

browserState_ = browserState;

reauthenticationModule_.reset([[ReauthenticationModule alloc]

initWithSuccessfulReauthTimeAccessor:self]);

- int titleId = IDS_IOS_SAVE_PASSWORDS;

- syncer::SyncService* syncService =

- IOSChromeProfileSyncServiceFactory::GetForBrowserState(browserState_);

- if (password_bubble_experiment::IsSmartLockBrandingEnabled(syncService)) {

- titleId = IDS_IOS_SAVE_PASSWORDS_SMART_LOCK;

- }

- self.title = l10n_util::GetNSString(titleId);

+ self.title = l10n_util::GetNSString(IDS_IOS_SAVE_PASSWORDS);

self.shouldHideDoneButton = YES;

passwordStore_ = IOSChromePasswordStoreFactory::GetForBrowserState(

browserState_, ServiceAccessType::EXPLICIT_ACCESS);