Commit d49731eb authored by Jeffrey Young's avatar Jeffrey Young Committed by Commit Bot

assistant: enable launcher integration by default

BUG=1103703

Change-Id: I1505384aadc98eea6e0dab4ecf51b2cd0a045e10
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440292Reviewed-by: default avatarDavid Black <dmblack@google.com>
Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Reviewed-by: default avatarXiaohui Chen <xiaohuic@chromium.org>
Reviewed-by: default avatarXiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Jeffrey Young <cowmoo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813887}
parent 953b596e
......@@ -2498,19 +2498,6 @@ TEST_F(AppListViewTest, AppsGridVisibilityOnResetForShow) {
EXPECT_FALSE(assistant_page_view()->GetVisible());
}
// Tests that no answer card view when kEnableAssistantSearch is enabled.
TEST_F(AppListViewTest, NoAnswerCardWhenEmbeddedAssistantUIEnabled) {
base::test::ScopedFeatureList scoped_feature_list;
scoped_feature_list.InitWithFeatures(
{app_list_features::kEnableAssistantSearch}, {});
ASSERT_TRUE(app_list_features::IsAssistantSearchEnabled());
Initialize(false /*is_tablet_mode*/);
Show();
EXPECT_FALSE(contents_view()->search_result_answer_card_view_for_test());
}
// Tests that pressing escape in embedded Assistant UI returns to fullscreen
// if the Assistant UI was launched from fullscreen app list.
TEST_F(AppListViewTest, EscapeKeyInEmbeddedAssistantUIReturnsToAppList) {
......
......@@ -38,7 +38,7 @@ const base::Feature kEnableSuggestedFiles{"EnableSuggestedFiles",
// change it until fully launched. It is used to redirect Launcher search to
// Assistant search.
const base::Feature kEnableAssistantSearch{"EnableEmbeddedAssistantUI",
base::FEATURE_DISABLED_BY_DEFAULT};
base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kEnableAppGridGhost{"EnableAppGridGhost",
base::FEATURE_DISABLED_BY_DEFAULT};
......@@ -60,10 +60,7 @@ const base::Feature kEnableOmniboxRichEntities{
"EnableOmniboxRichEntities", base::FEATURE_DISABLED_BY_DEFAULT};
bool IsAnswerCardEnabled() {
// Not using local static variable to allow tests to change this value.
// Do not show answer card if Assistant search is enabled.
return base::FeatureList::IsEnabled(kEnableAnswerCard) &&
!IsAssistantSearchEnabled();
return base::FeatureList::IsEnabled(kEnableAnswerCard);
}
bool IsAppDataSearchEnabled() {
......
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