[iOS][SK] Clean APIs
Fixed: 373825718
Bug: 374689843
Change-Id: I2006bb734394591636a4941040dfc53ea27aba58
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5952408
Reviewed-by: Gauthier Ambard <gambard@chromium.org>
Commit-Queue: Ewann Pellé <ewannpv@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1372571}
diff --git a/ios/chrome/browser/providers/share_kit/chromium_share_kit.mm b/ios/chrome/browser/providers/share_kit/chromium_share_kit.mm
index 333dc0b4..287a513 100644
--- a/ios/chrome/browser/providers/share_kit/chromium_share_kit.mm
+++ b/ios/chrome/browser/providers/share_kit/chromium_share_kit.mm
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "ios/chrome/browser/share_kit/model/share_kit_join_configuration.h"
#import "ios/chrome/browser/share_kit/model/share_kit_service.h"
#import "ios/chrome/browser/share_kit/model/share_kit_service_configuration.h"
#import "ios/public/provider/chrome/browser/share_kit/share_kit_api.h"
@@ -18,11 +17,7 @@
// ShareKitService.
bool IsSupported() const override { return false; }
void ShareGroup(ShareKitShareGroupConfiguration* config) override {}
- void ShareGroup(const TabGroup* group,
- UIViewController* base_view_controller,
- id<ApplicationCommands> commandsHandler) override {}
void JoinGroup(ShareKitJoinConfiguration* configuration) override {}
- UIViewController* FacePile(NSString* collab_id) override { return nil; }
UIViewController* FacePile(ShareKitFacePileConfiguration* config) override {
return nil;
}
diff --git a/ios/chrome/browser/share_kit/model/share_kit_service.h b/ios/chrome/browser/share_kit/model/share_kit_service.h
index 2721fbcb..f582d5e4 100644
--- a/ios/chrome/browser/share_kit/model/share_kit_service.h
+++ b/ios/chrome/browser/share_kit/model/share_kit_service.h
@@ -10,11 +10,9 @@
#import "base/memory/weak_ptr.h"
#import "components/keyed_service/core/keyed_service.h"
-@protocol ApplicationCommands;
@class ShareKitFacePileConfiguration;
@class ShareKitJoinConfiguration;
@class ShareKitShareGroupConfiguration;
-class TabGroup;
// Service for ShareKit, allowing to manage tab groups sharing.
class ShareKitService : public KeyedService {
@@ -28,24 +26,14 @@
// execution of the application.
virtual bool IsSupported() const = 0;
- // TODO(crbug.com/373825718): Make the API pure virtual.
// Initiates the share group flow for the given `config`.
- virtual void ShareGroup(ShareKitShareGroupConfiguration* config);
- // TODO(crbug.com/373825718): Remove this API.
- // Initiates the share of `group`, presenting a view controller on top of
- // `base_view_controller`. `commandsHandler` is used to open new tabs.
- virtual void ShareGroup(const TabGroup* group,
- UIViewController* base_view_controller,
- id<ApplicationCommands> commandsHandler);
+ virtual void ShareGroup(ShareKitShareGroupConfiguration* config) = 0;
- // TODO(crbug.com/373825718): Make it pure virtual.
// Initiates the flow to join the group, using `configuration`.
- virtual void JoinGroup(ShareKitJoinConfiguration* configuration);
+ virtual void JoinGroup(ShareKitJoinConfiguration* configuration) = 0;
// Returns a new FacePile view controller for the given `config`.
- virtual UIViewController* FacePile(ShareKitFacePileConfiguration* config);
- // TODO(crbug.com/374689843): Remove this API.
- virtual UIViewController* FacePile(NSString* collab_id);
+ virtual UIViewController* FacePile(ShareKitFacePileConfiguration* config) = 0;
};
#endif // IOS_CHROME_BROWSER_SHARE_KIT_MODEL_SHARE_KIT_SERVICE_H_
diff --git a/ios/chrome/browser/share_kit/model/share_kit_service.mm b/ios/chrome/browser/share_kit/model/share_kit_service.mm
index af425be..ac270f53 100644
--- a/ios/chrome/browser/share_kit/model/share_kit_service.mm
+++ b/ios/chrome/browser/share_kit/model/share_kit_service.mm
@@ -4,30 +4,6 @@
#import "ios/chrome/browser/share_kit/model/share_kit_service.h"
-#import "ios/chrome/browser/share_kit/model/share_kit_face_pile_configuration.h"
-#import "ios/chrome/browser/share_kit/model/share_kit_share_group_configuration.h"
-
ShareKitService::ShareKitService() = default;
ShareKitService::~ShareKitService() = default;
-
-void ShareKitService::ShareGroup(ShareKitShareGroupConfiguration* config) {
- ShareGroup(config.tabGroup, config.baseViewController,
- config.applicationHandler);
-}
-
-void ShareKitService::ShareGroup(const TabGroup* group,
- UIViewController* base_view_controller,
- id<ApplicationCommands> commandsHandler) {
-}
-
-UIViewController* ShareKitService::FacePile(NSString* collab_id) {
- return nil;
-}
-
-UIViewController* ShareKitService::FacePile(
- ShareKitFacePileConfiguration* config) {
- return FacePile(config.collabID);
-}
-
-void ShareKitService::JoinGroup(ShareKitJoinConfiguration* configuration) {}
diff --git a/ios/chrome/browser/share_kit/model/test_share_kit_service.h b/ios/chrome/browser/share_kit/model/test_share_kit_service.h
index 9db2257..34afec8a 100644
--- a/ios/chrome/browser/share_kit/model/test_share_kit_service.h
+++ b/ios/chrome/browser/share_kit/model/test_share_kit_service.h
@@ -18,11 +18,7 @@
// ShareKitService.
bool IsSupported() const override;
void ShareGroup(ShareKitShareGroupConfiguration* config) override;
- void ShareGroup(const TabGroup* group,
- UIViewController* base_view_controller,
- id<ApplicationCommands> commandsHandler) override;
void JoinGroup(ShareKitJoinConfiguration* configuration) override;
- UIViewController* FacePile(NSString* collab_id) override;
UIViewController* FacePile(ShareKitFacePileConfiguration* config) override;
};
diff --git a/ios/chrome/browser/share_kit/model/test_share_kit_service.mm b/ios/chrome/browser/share_kit/model/test_share_kit_service.mm
index 49a604c..182ad8a 100644
--- a/ios/chrome/browser/share_kit/model/test_share_kit_service.mm
+++ b/ios/chrome/browser/share_kit/model/test_share_kit_service.mm
@@ -15,20 +15,10 @@
// TODO(crbug.com/358373145): add fake implementation.
}
-void TestShareKitService::ShareGroup(const TabGroup* group,
- UIViewController* base_view_controller,
- id<ApplicationCommands> commandsHandler) {
-}
-
void TestShareKitService::JoinGroup(ShareKitJoinConfiguration* configuration) {
// TODO(crbug.com/358373145): add fake implementation.
}
-UIViewController* TestShareKitService::FacePile(NSString* collab_id) {
- // TODO(crbug.com/358373145): add fake implementation.
- return nil;
-}
-
UIViewController* TestShareKitService::FacePile(
ShareKitFacePileConfiguration* config) {
// TODO(crbug.com/358373145): add fake implementation.
