| Index: ios/chrome/app/main_controller.mm
|
| diff --git a/ios/chrome/app/main_controller.mm b/ios/chrome/app/main_controller.mm
|
| index abf595ef627581063b8bf2d1c3e5187c8f51f832..78a883732ce5937099987b205848482c9a07f587 100644
|
| --- a/ios/chrome/app/main_controller.mm
|
| +++ b/ios/chrome/app/main_controller.mm
|
| @@ -946,8 +946,7 @@ enum class StackViewDismissalMode { NONE, NORMAL, INCOGNITO };
|
| }
|
|
|
| - (BOOL)startQRScannerAfterTabSwitcherDismissal {
|
| - return (experimental_flags::IsQRCodeReaderEnabled() &&
|
| - _startQRScannerAfterTabSwitcherDismissal);
|
| + return _startQRScannerAfterTabSwitcherDismissal;
|
| }
|
|
|
| - (void)setStartQRScannerAfterTabSwitcherDismissal:(BOOL)startQRScanner {
|
| @@ -1212,7 +1211,6 @@ enum class StackViewDismissalMode { NONE, NORMAL, INCOGNITO };
|
| [self scheduleDeleteDownloadsDirectory];
|
| [self scheduleStartupAttemptReset];
|
| [self scheduleFreeMemoryMonitoring];
|
| - [self scheduleAddApplicationShortcutItems];
|
| [self scheduleAppDistributionPings];
|
| [self scheduleCheckNativeApps];
|
| }
|
| @@ -1244,34 +1242,6 @@ enum class StackViewDismissalMode { NONE, NORMAL, INCOGNITO };
|
| block:block];
|
| }
|
|
|
| -- (void)scheduleAddApplicationShortcutItems {
|
| - ProceduralBlock block = ^{
|
| - if (experimental_flags::IsQRCodeReaderEnabled()) {
|
| - UIApplicationShortcutItem* qrScannerShortcutItem = [[
|
| - [UIApplicationShortcutItem alloc]
|
| - initWithType:@"OpenQRScanner"
|
| - localizedTitle:l10n_util::GetNSString(
|
| - IDS_IOS_APPLICATION_SHORTCUT_QR_SCANNER_TITLE)
|
| - localizedSubtitle:nil
|
| - icon:[UIApplicationShortcutIcon
|
| - iconWithTemplateImageName:
|
| - @"quick_action_qr_scanner"]
|
| - userInfo:nil] autorelease];
|
| - // Note: The following only affects dynamic shortcut items defined
|
| - // programmatically, and not static shortcut items set in the Info.plist
|
| - // file.
|
| - [[UIApplication sharedApplication]
|
| - setShortcutItems:@[ qrScannerShortcutItem ]];
|
| - } else {
|
| - [[UIApplication sharedApplication] setShortcutItems:nil];
|
| - }
|
| - };
|
| -
|
| - [[DeferredInitializationRunner sharedInstance]
|
| - enqueueBlockNamed:kAddApplicationShortcutItems
|
| - block:block];
|
| -}
|
| -
|
| - (void)expireFirstUserActionRecorder {
|
| // Clear out any scheduled calls to this method. For example, the app may have
|
| // been backgrounded before the |kFirstUserActionTimeout| expired.
|
|
|