Commit b0a9a929 authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Commit Bot

[iOS] Removing showSyncSettings method from dispatcher

Removing -[id<SyncPresenter> showSyncSettings]. This method is used for
pre unity UI.
Unified consent feature flag is now always true.

Bug: 951313
Change-Id: I9e47d05a90f9ba46f8f8e1c0163795ab329194ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1811019Reviewed-by: default avatarGauthier Ambard <gambard@chromium.org>
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#697940}
parent c83634e5
...@@ -4974,10 +4974,6 @@ NSString* const kBrowserViewControllerSnackbarCategory = ...@@ -4974,10 +4974,6 @@ NSString* const kBrowserViewControllerSnackbarCategory =
baseViewController:self]; baseViewController:self];
} }
- (void)showSyncSettings {
[self.dispatcher showGoogleServicesSettingsFromViewController:self];
}
- (void)showSyncPassphraseSettings { - (void)showSyncPassphraseSettings {
[self.dispatcher showSyncPassphraseSettingsFromViewController:self]; [self.dispatcher showSyncPassphraseSettingsFromViewController:self];
} }
......
...@@ -1147,10 +1147,6 @@ const int kRecentlyClosedTabsSectionIndex = 0; ...@@ -1147,10 +1147,6 @@ const int kRecentlyClosedTabsSectionIndex = 0;
baseViewController:self]; baseViewController:self];
} }
- (void)showSyncSettings {
[self.dispatcher showGoogleServicesSettingsFromViewController:self];
}
- (void)showSyncPassphraseSettings { - (void)showSyncPassphraseSettings {
[self.dispatcher showSyncPassphraseSettingsFromViewController:self]; [self.dispatcher showSyncPassphraseSettingsFromViewController:self];
} }
...@@ -1187,7 +1183,7 @@ const int kRecentlyClosedTabsSectionIndex = 0; ...@@ -1187,7 +1183,7 @@ const int kRecentlyClosedTabsSectionIndex = 0;
if (ShouldShowSyncSignin(syncState)) { if (ShouldShowSyncSignin(syncState)) {
[self showReauthenticateSignin]; [self showReauthenticateSignin];
} else if (ShouldShowSyncSettings(syncState)) { } else if (ShouldShowSyncSettings(syncState)) {
[self showSyncSettings]; [self showGoogleServicesSettings];
} else if (ShouldShowSyncPassphraseSettings(syncState)) { } else if (ShouldShowSyncPassphraseSettings(syncState)) {
[self showSyncPassphraseSettings]; [self showSyncPassphraseSettings];
} }
......
...@@ -19,7 +19,6 @@ source_set("utils") { ...@@ -19,7 +19,6 @@ source_set("utils") {
"//components/infobars/core", "//components/infobars/core",
"//components/strings", "//components/strings",
"//components/sync", "//components/sync",
"//components/unified_consent",
"//google_apis", "//google_apis",
"//ios/chrome/app/strings", "//ios/chrome/app/strings",
"//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state",
......
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
#include "components/infobars/core/infobar_delegate.h" #include "components/infobars/core/infobar_delegate.h"
#include "components/infobars/core/infobar_manager.h" #include "components/infobars/core/infobar_manager.h"
#include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_service.h"
#include "components/unified_consent/feature.h"
#import "ios/chrome/browser/browser_state/chrome_browser_state.h" #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/sync/profile_sync_service_factory.h" #include "ios/chrome/browser/sync/profile_sync_service_factory.h"
#include "ios/chrome/browser/sync/sync_setup_service.h" #include "ios/chrome/browser/sync/sync_setup_service.h"
...@@ -94,11 +93,7 @@ bool SyncErrorInfoBarDelegate::Accept() { ...@@ -94,11 +93,7 @@ bool SyncErrorInfoBarDelegate::Accept() {
if (ShouldShowSyncSignin(error_state_)) { if (ShouldShowSyncSignin(error_state_)) {
[presenter_ showReauthenticateSignin]; [presenter_ showReauthenticateSignin];
} else if (ShouldShowSyncSettings(error_state_)) { } else if (ShouldShowSyncSettings(error_state_)) {
if (unified_consent::IsUnifiedConsentFeatureEnabled()) { [presenter_ showGoogleServicesSettings];
[presenter_ showGoogleServicesSettings];
} else {
[presenter_ showSyncSettings];
}
} else if (ShouldShowSyncPassphraseSettings(error_state_)) { } else if (ShouldShowSyncPassphraseSettings(error_state_)) {
[presenter_ showSyncPassphraseSettings]; [presenter_ showSyncPassphraseSettings];
} }
......
...@@ -13,9 +13,6 @@ ...@@ -13,9 +13,6 @@
// Asks the presenter to display the reauthenticate signin UI. // Asks the presenter to display the reauthenticate signin UI.
- (void)showReauthenticateSignin; - (void)showReauthenticateSignin;
// Asks the presenter to display the sync settings UI.
- (void)showSyncSettings;
// Asks the presenter to display the sync encryption passphrase UI. // Asks the presenter to display the sync encryption passphrase UI.
- (void)showSyncPassphraseSettings; - (void)showSyncPassphraseSettings;
......
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "components/infobars/core/infobar_manager.h" #include "components/infobars/core/infobar_manager.h"
#include "components/strings/grit/components_strings.h" #include "components/strings/grit/components_strings.h"
#include "components/unified_consent/feature.h"
#import "ios/chrome/browser/browser_state/chrome_browser_state.h" #import "ios/chrome/browser/browser_state/chrome_browser_state.h"
#include "ios/chrome/browser/infobars/infobar_manager_impl.h" #include "ios/chrome/browser/infobars/infobar_manager_impl.h"
#include "ios/chrome/browser/sync/sync_setup_service.h" #include "ios/chrome/browser/sync/sync_setup_service.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment