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

Side by Side Diff: ios/chrome/app/application_delegate/user_activity_handler.mm

Issue 2709793002: Remove SpotlightActions experimental flag. (Closed)
Patch Set: Remove experiment from plist 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 unified diff | Download patch
« no previous file with comments | « no previous file | ios/chrome/app/spotlight/actions_spotlight_manager.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "ios/chrome/app/application_delegate/user_activity_handler.h" 5 #import "ios/chrome/app/application_delegate/user_activity_handler.h"
6 6
7 #import <CoreSpotlight/CoreSpotlight.h> 7 #import <CoreSpotlight/CoreSpotlight.h>
8 #import <UIKit/UIKit.h> 8 #import <UIKit/UIKit.h>
9 9
10 #include "base/ios/block_types.h" 10 #include "base/ios/block_types.h"
11 #include "base/ios/ios_util.h" 11 #include "base/ios/ios_util.h"
12 #include "base/mac/foundation_util.h" 12 #include "base/mac/foundation_util.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/metrics/user_metrics_action.h" 14 #include "base/metrics/user_metrics_action.h"
15 #include "base/strings/sys_string_conversions.h" 15 #include "base/strings/sys_string_conversions.h"
16 #include "components/handoff/handoff_utility.h" 16 #include "components/handoff/handoff_utility.h"
17 #import "ios/chrome/app/application_delegate/startup_information.h" 17 #import "ios/chrome/app/application_delegate/startup_information.h"
18 #import "ios/chrome/app/application_delegate/tab_opening.h" 18 #import "ios/chrome/app/application_delegate/tab_opening.h"
19 #include "ios/chrome/app/application_mode.h" 19 #include "ios/chrome/app/application_mode.h"
20 #import "ios/chrome/app/spotlight/actions_spotlight_manager.h" 20 #import "ios/chrome/app/spotlight/actions_spotlight_manager.h"
21 #import "ios/chrome/app/spotlight/spotlight_util.h" 21 #import "ios/chrome/app/spotlight/spotlight_util.h"
22 #include "ios/chrome/browser/app_startup_parameters.h" 22 #include "ios/chrome/browser/app_startup_parameters.h"
23 #include "ios/chrome/browser/chrome_url_constants.h" 23 #include "ios/chrome/browser/chrome_url_constants.h"
24 #include "ios/chrome/browser/experimental_flags.h"
25 #include "ios/chrome/browser/metrics/first_user_action_recorder.h" 24 #include "ios/chrome/browser/metrics/first_user_action_recorder.h"
26 #import "ios/chrome/browser/tabs/tab.h" 25 #import "ios/chrome/browser/tabs/tab.h"
27 #import "ios/chrome/browser/tabs/tab_model.h" 26 #import "ios/chrome/browser/tabs/tab_model.h"
28 #import "ios/chrome/browser/u2f/u2f_controller.h" 27 #import "ios/chrome/browser/u2f/u2f_controller.h"
29 #import "ios/chrome/browser/ui/main/browser_view_information.h" 28 #import "ios/chrome/browser/ui/main/browser_view_information.h"
30 #import "net/base/mac/url_conversions.h" 29 #import "net/base/mac/url_conversions.h"
31 #include "ui/base/page_transition_types.h" 30 #include "ui/base/page_transition_types.h"
32 #include "url/gurl.h" 31 #include "url/gurl.h"
33 32
34 #if !defined(__has_feature) || !__has_feature(objc_arc) 33 #if !defined(__has_feature) || !__has_feature(objc_arc)
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 [startupInformation setStartupParameters:startupParams]; 83 [startupInformation setStartupParameters:startupParams];
85 base::RecordAction(base::UserMetricsAction("IOSLaunchedByUniversalLink")); 84 base::RecordAction(base::UserMetricsAction("IOSLaunchedByUniversalLink"));
86 } else if (spotlight::IsSpotlightAvailable() && 85 } else if (spotlight::IsSpotlightAvailable() &&
87 [userActivity.activityType 86 [userActivity.activityType
88 isEqualToString:CSSearchableItemActionType]) { 87 isEqualToString:CSSearchableItemActionType]) {
89 // App was launched by iOS as the result of a tap on a Spotlight Search 88 // App was launched by iOS as the result of a tap on a Spotlight Search
90 // result. 89 // result.
91 NSString* itemID = 90 NSString* itemID =
92 [userActivity.userInfo objectForKey:CSSearchableItemActivityIdentifier]; 91 [userActivity.userInfo objectForKey:CSSearchableItemActivityIdentifier];
93 spotlight::Domain domain = spotlight::SpotlightDomainFromString(itemID); 92 spotlight::Domain domain = spotlight::SpotlightDomainFromString(itemID);
94 if (domain == spotlight::DOMAIN_ACTIONS &&
95 !experimental_flags::IsSpotlightActionsEnabled()) {
96 return NO;
97 }
98 UMA_HISTOGRAM_ENUMERATION("IOS.Spotlight.Origin", domain, 93 UMA_HISTOGRAM_ENUMERATION("IOS.Spotlight.Origin", domain,
99 spotlight::DOMAIN_COUNT); 94 spotlight::DOMAIN_COUNT);
100 95
101 if (!itemID) { 96 if (!itemID) {
102 return NO; 97 return NO;
103 } 98 }
104 if (domain == spotlight::DOMAIN_ACTIONS) { 99 if (domain == spotlight::DOMAIN_ACTIONS) {
105 webpageURL = 100 webpageURL =
106 [NSURL URLWithString:base::SysUTF8ToNSString(kChromeUINewTabURL)]; 101 [NSURL URLWithString:base::SysUTF8ToNSString(kChromeUINewTabURL)];
107 AppStartupParameters* startupParams = [[AppStartupParameters alloc] 102 AppStartupParameters* startupParams = [[AppStartupParameters alloc]
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 for (Tab* tab in tabModel) { 305 for (Tab* tab in tabModel) {
311 if ([tab.tabId isEqualToString:tabID]) { 306 if ([tab.tabId isEqualToString:tabID]) {
312 [tab evaluateU2FResultFromURL:URL]; 307 [tab evaluateU2FResultFromURL:URL];
313 return; 308 return;
314 } 309 }
315 } 310 }
316 } 311 }
317 } 312 }
318 313
319 @end 314 @end
OLDNEW
« no previous file with comments | « no previous file | ios/chrome/app/spotlight/actions_spotlight_manager.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698