From 06b8422f34539d5cc693b3e169b395c58deb59a8 Mon Sep 17 00:00:00 2001 From: Quentin Pubert Date: Thu, 27 Apr 2023 12:12:06 +0000 Subject: [PATCH] [iOS] Add NSUserActivityTypeBrowsingWeb compatible modes This CL fixes `CompatibleModeForActivityType` to add the activity type NSUserActivityTypeBrowsingWeb as a possible input and avoid NOTREACHED. This activity type might be passed when the Handoff feature is used. (cherry picked from commit 473ca15f90bcb15965ad2f6daf5d08f43ac24682) Fixed: 1435075 Change-Id: Ibb07bbda2fccb3b3807bc420c95d64b7f41bb4ea Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4466163 Reviewed-by: Mark Cogan Commit-Queue: Quentin Pubert Code-Coverage: Findit Reviewed-by: Olivier Robin Cr-Original-Commit-Position: refs/heads/main@{#1135811} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4481933 Cr-Commit-Position: refs/branch-heads/5735@{#18} Cr-Branched-From: 2f562e4ddbaf79a3f3cb338b4d1bd4398d49eb67-refs/heads/main@{#1135570} --- .../app/application_delegate/user_activity_handler.mm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ios/chrome/app/application_delegate/user_activity_handler.mm b/ios/chrome/app/application_delegate/user_activity_handler.mm index 941844a804917e..f52a319131e399 100644 --- a/ios/chrome/app/application_delegate/user_activity_handler.mm +++ b/ios/chrome/app/application_delegate/user_activity_handler.mm @@ -13,6 +13,7 @@ #import "base/metrics/histogram_macros.h" #import "base/metrics/user_metrics_action.h" #import "base/strings/sys_string_conversions.h" +#import "components/crash/core/common/crash_key.h" #import "components/handoff/handoff_utility.h" #import "components/search_engines/template_url_service.h" #import "ios/chrome/app/app_startup_parameters.h" @@ -80,7 +81,8 @@ [activityType isEqualToString:kShortcutVoiceSearch] || [activityType isEqualToString:kShortcutQRScanner] || [activityType isEqualToString:kShortcutLens] || - [activityType isEqualToString:kSiriShortcutSearchInChrome]) { + [activityType isEqualToString:kSiriShortcutSearchInChrome] || + [activityType isEqualToString:NSUserActivityTypeBrowsingWeb]) { return @[ kRegularMode, kIncognitoMode ]; } else if ([activityType isEqualToString:kSiriShortcutOpenInChrome]) { return @[ kRegularMode ]; @@ -88,7 +90,10 @@ [activityType isEqualToString:kSiriShortcutOpenInIncognito]) { return @[ kIncognitoMode ]; } else { - NOTREACHED(); + static crash_reporter::CrashKeyString<4> key("activity"); + crash_reporter::ScopedCrashKeyString crash_key( + &key, base::SysNSStringToUTF8(activityType)); + base::debug::DumpWithoutCrashing(); } return nil; }