Commit bcc1628c authored by khmel@chromium.org's avatar khmel@chromium.org Committed by Commit Bot

arc: Fix crash in ARC app search provider (multi-profile mode)

We allow using multiple profiles but ARC works only with primary. This
checks this condition (wider case) and does not create provider.

TEST=Manually. no longer crash.
BUG=891749

Change-Id: I706f2c4c6f10e0eb889d52d546d4a7bc34459d99
Reviewed-on: https://chromium-review.googlesource.com/c/1277377
Commit-Queue: Yury Khmel <khmel@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#598898}
parent 87b1d08a
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/time/default_clock.h" #include "base/time/default_clock.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/app_list/search/answer_card/answer_card_search_provider.h" #include "chrome/browser/ui/app_list/search/answer_card/answer_card_search_provider.h"
#include "chrome/browser/ui/app_list/search/answer_card/answer_card_web_contents.h" #include "chrome/browser/ui/app_list/search/answer_card/answer_card_web_contents.h"
...@@ -138,7 +139,8 @@ std::unique_ptr<SearchController> CreateSearchController( ...@@ -138,7 +139,8 @@ std::unique_ptr<SearchController> CreateSearchController(
std::make_unique<SettingsShortcutProvider>(profile)); std::make_unique<SettingsShortcutProvider>(profile));
} }
if (app_list_features::IsAppShortcutSearchEnabled()) { if (app_list_features::IsAppShortcutSearchEnabled() &&
arc::IsArcAllowedForProfile(profile)) {
size_t app_shortcut_group_id = size_t app_shortcut_group_id =
controller->AddGroup(kMaxAppShortcutResults, 1.0, kBoostOfApps); controller->AddGroup(kMaxAppShortcutResults, 1.0, kBoostOfApps);
controller->AddProvider( controller->AddProvider(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment