OLD | NEW |
1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 #include "ui/app_list/app_list_features.h" | 5 #include "ui/app_list/app_list_features.h" |
6 | 6 |
7 #include "base/feature_list.h" | 7 #include "base/feature_list.h" |
8 #include "base/metrics/field_trial_params.h" | 8 #include "base/metrics/field_trial_params.h" |
| 9 #include "ui/app_list/app_list_switches.h" |
9 | 10 |
10 namespace app_list { | 11 namespace app_list { |
11 namespace features { | 12 namespace features { |
12 | 13 |
13 const base::Feature kEnableAnswerCard{"EnableAnswerCard", | 14 const base::Feature kEnableAnswerCard{"EnableAnswerCard", |
14 base::FEATURE_DISABLED_BY_DEFAULT}; | 15 base::FEATURE_DISABLED_BY_DEFAULT}; |
15 const base::Feature kEnableAnswerCardDarkRun{"EnableAnswerCardDarkRun", | 16 const base::Feature kEnableAnswerCardDarkRun{"EnableAnswerCardDarkRun", |
16 base::FEATURE_DISABLED_BY_DEFAULT}; | 17 base::FEATURE_DISABLED_BY_DEFAULT}; |
17 const base::Feature kEnableFullscreenAppList{"EnableFullscreenAppList", | 18 const base::Feature kEnableFullscreenAppList{"EnableFullscreenAppList", |
18 base::FEATURE_DISABLED_BY_DEFAULT}; | 19 base::FEATURE_DISABLED_BY_DEFAULT}; |
19 const base::Feature kEnablePlaystoreAppSearch{ | 20 const base::Feature kEnablePlaystoreAppSearch{ |
20 "EnablePlaystoreAppSearch", base::FEATURE_DISABLED_BY_DEFAULT}; | 21 "EnablePlaystoreAppSearch", base::FEATURE_DISABLED_BY_DEFAULT}; |
21 | 22 |
22 bool IsAnswerCardEnabled() { | 23 bool IsAnswerCardEnabled() { |
23 static const bool enabled = base::FeatureList::IsEnabled(kEnableAnswerCard); | 24 static const bool enabled = base::FeatureList::IsEnabled(kEnableAnswerCard); |
24 return enabled; | 25 return enabled; |
25 } | 26 } |
26 | 27 |
27 bool IsAnswerCardDarkRunEnabled() { | 28 bool IsAnswerCardDarkRunEnabled() { |
28 static const bool enabled = | 29 static const bool enabled = |
29 base::FeatureList::IsEnabled(kEnableAnswerCardDarkRun); | 30 base::FeatureList::IsEnabled(kEnableAnswerCardDarkRun); |
30 return enabled; | 31 return enabled; |
31 } | 32 } |
32 | 33 |
33 bool IsFullscreenAppListEnabled() { | 34 bool IsFullscreenAppListEnabled() { |
34 // Not using local static variable to allow tests to change this value. | 35 // Not using local static variable to allow tests to change this value. |
35 return base::FeatureList::IsEnabled(kEnableFullscreenAppList); | 36 return switches::IsFullscreenAppListEnabled() || |
| 37 base::FeatureList::IsEnabled(kEnableFullscreenAppList); |
36 } | 38 } |
37 | 39 |
38 bool IsSearchResultsNewDesignEnabled() { | 40 bool IsSearchResultsNewDesignEnabled() { |
39 return IsFullscreenAppListEnabled() || | 41 return IsFullscreenAppListEnabled() || |
40 (IsAnswerCardEnabled() && !IsAnswerCardDarkRunEnabled()); | 42 (IsAnswerCardEnabled() && !IsAnswerCardDarkRunEnabled()); |
41 } | 43 } |
42 | 44 |
43 bool IsPlaystoreAppSearchEnabled() { | 45 bool IsPlaystoreAppSearchEnabled() { |
44 static const bool enabled = | 46 static const bool enabled = |
45 base::FeatureList::IsEnabled(kEnablePlaystoreAppSearch); | 47 base::FeatureList::IsEnabled(kEnablePlaystoreAppSearch); |
(...skipping 11 matching lines...) Expand all Loading... |
57 kEnableAnswerCard, "CardMaxHeight", 266); | 59 kEnableAnswerCard, "CardMaxHeight", 266); |
58 return max_height; | 60 return max_height; |
59 } | 61 } |
60 | 62 |
61 std::string AnswerServerUrl() { | 63 std::string AnswerServerUrl() { |
62 return base::GetFieldTrialParamValueByFeature(kEnableAnswerCard, "ServerUrl"); | 64 return base::GetFieldTrialParamValueByFeature(kEnableAnswerCard, "ServerUrl"); |
63 } | 65 } |
64 | 66 |
65 } // namespace features | 67 } // namespace features |
66 } // namespace app_list | 68 } // namespace app_list |
OLD | NEW |