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

Unified Diff: ios/chrome/app/spotlight/actions_spotlight_manager.mm

Issue 2676803002: Remove the iOS QR Code scanner experiment code. (Closed)
Patch Set: Addressed comments. 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
« no previous file with comments | « ios/chrome/app/resources/quick_action_qr_scanner@3x.png ('k') | ios/chrome/browser/about_flags.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/app/spotlight/actions_spotlight_manager.mm
diff --git a/ios/chrome/app/spotlight/actions_spotlight_manager.mm b/ios/chrome/app/spotlight/actions_spotlight_manager.mm
index e26959dbe8bb5c7f5dc0aedfbddfbdb3c7b959ea..9dea68b83c0dbd48515e180be93672ab8134adf3 100644
--- a/ios/chrome/app/spotlight/actions_spotlight_manager.mm
+++ b/ios/chrome/app/spotlight/actions_spotlight_manager.mm
@@ -160,25 +160,18 @@ BOOL SetStartupParametersForSpotlightAction(
NSString* incognitoAction = base::SysUTF8ToNSString(
spotlight::kSpotlightActionNewIncognitoTab);
- NSMutableArray* spotlightItems = [NSMutableArray
- arrayWithObjects:[strongSelf getItemForAction:voiceSearchAction
- title:voiceSearchTitle],
- [strongSelf getItemForAction:newTabAction
- title:newTabTitle],
- [strongSelf getItemForAction:incognitoAction
- title:incognitoTitle],
- nil];
-
- if (experimental_flags::IsQRCodeReaderEnabled()) {
- NSString* qrScannerTitle = l10n_util::GetNSString(
- IDS_IOS_APPLICATION_SHORTCUT_QR_SCANNER_TITLE);
- NSString* qrScannerAction =
- base::SysUTF8ToNSString(spotlight::kSpotlightActionQRScanner);
-
- [spotlightItems
- addObject:[strongSelf getItemForAction:qrScannerAction
- title:qrScannerTitle]];
- }
+ NSString* qrScannerTitle = l10n_util::GetNSString(
+ IDS_IOS_APPLICATION_SHORTCUT_QR_SCANNER_TITLE);
+ NSString* qrScannerAction =
+ base::SysUTF8ToNSString(spotlight::kSpotlightActionQRScanner);
+
+ NSArray* spotlightItems = @[
+ [strongSelf getItemForAction:voiceSearchAction
+ title:voiceSearchTitle],
+ [strongSelf getItemForAction:newTabAction title:newTabTitle],
+ [strongSelf getItemForAction:incognitoAction title:incognitoTitle],
+ [strongSelf getItemForAction:qrScannerAction title:qrScannerTitle]
sdefresne 2017/02/03 16:16:42 nit: keep the trailing comma :-)
jif 2017/02/03 16:22:21 Done.
+ ];
[[CSSearchableIndex defaultSearchableIndex]
indexSearchableItems:spotlightItems
« no previous file with comments | « ios/chrome/app/resources/quick_action_qr_scanner@3x.png ('k') | ios/chrome/browser/about_flags.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698