Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(437)

Unified Diff: ios/chrome/app/main_controller.mm

Issue 2676803002: Remove the iOS QR Code scanner experiment code. (Closed)
Patch Set: Addressed comment. Created 3 years, 10 months 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
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..d39036865a67570b9c3d9319ce22022cb4e32e20 100644
--- a/ios/chrome/app/main_controller.mm
+++ b/ios/chrome/app/main_controller.mm
@@ -125,7 +125,6 @@
#import "ios/chrome/browser/ui/util/top_view_controller.h"
#import "ios/chrome/browser/ui/webui/chrome_web_ui_ios_controller_factory.h"
#include "ios/chrome/browser/xcallback_parameters.h"
-#include "ios/chrome/grit/ios_strings.h"
#include "ios/net/cookies/cookie_store_ios.h"
#import "ios/net/crn_http_protocol_handler.h"
#include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
@@ -147,7 +146,6 @@
#include "mojo/edk/embedder/embedder.h"
#import "net/base/mac/url_conversions.h"
#include "net/url_request/url_request_context.h"
-#include "ui/base/l10n/l10n_util.h"
namespace {
@@ -195,9 +193,6 @@ NSString* const kPurgeSnapshots = @"PurgeSnapshots";
NSString* const kStartSpotlightBookmarksIndexing =
@"StartSpotlightBookmarksIndexing";
-// Constants for deferred initialization of dynamic application shortcut items.
-NSString* const kAddApplicationShortcutItems = @"AddApplicationShortcutItems";
-
// Constants for deferred promo display.
const NSTimeInterval kDisplayPromoDelay = 0.1;
@@ -946,8 +941,7 @@ enum class StackViewDismissalMode { NONE, NORMAL, INCOGNITO };
}
- (BOOL)startQRScannerAfterTabSwitcherDismissal {
- return (experimental_flags::IsQRCodeReaderEnabled() &&
- _startQRScannerAfterTabSwitcherDismissal);
+ return _startQRScannerAfterTabSwitcherDismissal;
}
- (void)setStartQRScannerAfterTabSwitcherDismissal:(BOOL)startQRScanner {
@@ -1212,7 +1206,6 @@ enum class StackViewDismissalMode { NONE, NORMAL, INCOGNITO };
[self scheduleDeleteDownloadsDirectory];
[self scheduleStartupAttemptReset];
[self scheduleFreeMemoryMonitoring];
- [self scheduleAddApplicationShortcutItems];
[self scheduleAppDistributionPings];
[self scheduleCheckNativeApps];
}
@@ -1244,34 +1237,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.
« no previous file with comments | « ios/chrome/app/application_delegate/user_activity_handler_unittest.mm ('k') | ios/chrome/app/resources/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698