Index: ios/chrome/app/chrome_app_startup_parameters.mm |
diff --git a/ios/chrome/app/chrome_app_startup_parameters.mm b/ios/chrome/app/chrome_app_startup_parameters.mm |
index aeafd78661e77ff528a2ac727d25163825254829..5e3153becb74d593d8d48ed61c7b00b4ef5782f3 100644 |
--- a/ios/chrome/app/chrome_app_startup_parameters.mm |
+++ b/ios/chrome/app/chrome_app_startup_parameters.mm |
@@ -10,7 +10,6 @@ |
#include "base/metrics/user_metrics_action.h" |
#include "base/strings/sys_string_conversions.h" |
#include "ios/chrome/browser/chrome_url_constants.h" |
-#include "ios/chrome/browser/xcallback_parameters.h" |
#include "ios/chrome/common/app_group/app_group_constants.h" |
#include "ios/chrome/common/x_callback_url.h" |
#import "net/base/mac/url_conversions.h" |
@@ -56,18 +55,10 @@ enum MobileSessionStartAction { |
} |
- (instancetype)initWithExternalURL:(const GURL&)externalURL |
- xCallbackParameters:(XCallbackParameters*)xCallbackParameters { |
- NOTREACHED(); |
- return nil; |
-} |
- |
-- (instancetype)initWithExternalURL:(const GURL&)externalURL |
- xCallbackParameters:(XCallbackParameters*)xCallbackParameters |
declaredSourceApp:(NSString*)declaredSourceApp |
secureSourceApp:(NSString*)secureSourceApp |
completeURL:(NSURL*)completeURL { |
- self = [super initWithExternalURL:externalURL |
- xCallbackParameters:xCallbackParameters]; |
+ self = [super initWithExternalURL:externalURL]; |
if (self) { |
_declaredSourceApp = [declaredSourceApp copy]; |
_secureSourceApp = [secureSourceApp copy]; |
@@ -120,12 +111,8 @@ enum MobileSessionStartAction { |
return nil; |
} |
- XCallbackParameters* xcallbackParameters = |
- [[XCallbackParameters alloc] initWithSourceAppId:appId]; |
- |
return [[ChromeAppStartupParameters alloc] |
initWithExternalURL:url |
- xCallbackParameters:xcallbackParameters |
declaredSourceApp:appId |
secureSourceApp:nil |
completeURL:completeURL]; |
@@ -145,7 +132,6 @@ enum MobileSessionStartAction { |
if (!externalURL.is_valid()) |
return nil; |
return [[ChromeAppStartupParameters alloc] initWithExternalURL:externalURL |
- xCallbackParameters:nil |
declaredSourceApp:appId |
secureSourceApp:nil |
completeURL:completeURL]; |
@@ -166,7 +152,6 @@ enum MobileSessionStartAction { |
if (!externalURL.is_valid()) |
return nil; |
return [[ChromeAppStartupParameters alloc] initWithExternalURL:externalURL |
- xCallbackParameters:nil |
declaredSourceApp:appId |
secureSourceApp:nil |
completeURL:completeURL]; |
@@ -243,7 +228,6 @@ enum MobileSessionStartAction { |
app_group::kChromeAppGroupVoiceSearchCommand)]) { |
ChromeAppStartupParameters* params = [[ChromeAppStartupParameters alloc] |
initWithExternalURL:GURL(kChromeUINewTabURL) |
- xCallbackParameters:nil |
declaredSourceApp:appId |
secureSourceApp:secureSourceApp |
completeURL:url]; |
@@ -255,7 +239,6 @@ enum MobileSessionStartAction { |
app_group::kChromeAppGroupNewTabCommand)]) { |
return [[ChromeAppStartupParameters alloc] |
initWithExternalURL:GURL(kChromeUINewTabURL) |
- xCallbackParameters:nil |
declaredSourceApp:appId |
secureSourceApp:secureSourceApp |
completeURL:url]; |
@@ -266,7 +249,6 @@ enum MobileSessionStartAction { |
app_group::kChromeAppGroupFocusOmniboxCommand)]) { |
ChromeAppStartupParameters* params = [[ChromeAppStartupParameters alloc] |
initWithExternalURL:GURL(kChromeUINewTabURL) |
- xCallbackParameters:nil |
declaredSourceApp:appId |
secureSourceApp:secureSourceApp |
completeURL:url]; |
@@ -283,7 +265,6 @@ enum MobileSessionStartAction { |
return nil; |
return |
[[ChromeAppStartupParameters alloc] initWithExternalURL:externalURL |
- xCallbackParameters:nil |
declaredSourceApp:appId |
secureSourceApp:secureSourceApp |
completeURL:url]; |
@@ -294,7 +275,6 @@ enum MobileSessionStartAction { |
app_group::kChromeAppGroupQRScannerCommand)]) { |
ChromeAppStartupParameters* params = [[ChromeAppStartupParameters alloc] |
initWithExternalURL:GURL(kChromeUINewTabURL) |
- xCallbackParameters:nil |
declaredSourceApp:appId |
secureSourceApp:secureSourceApp |
completeURL:url]; |
@@ -307,7 +287,6 @@ enum MobileSessionStartAction { |
app_group::kChromeAppGroupIncognitoSearchCommand)]) { |
ChromeAppStartupParameters* params = [[ChromeAppStartupParameters alloc] |
initWithExternalURL:GURL(kChromeUINewTabURL) |
- xCallbackParameters:nil |
declaredSourceApp:appId |
secureSourceApp:secureSourceApp |
completeURL:url]; |