Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/omnibox/browser/omnibox_field_trial.h" | 5 #include "components/omnibox/browser/omnibox_field_trial.h" |
| 6 | 6 |
| 7 #include <cmath> | 7 #include <cmath> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 35 // Finch experiment arm which sends an experiment ID to GWS which triggers | 35 // Finch experiment arm which sends an experiment ID to GWS which triggers |
| 36 // serving the new types. | 36 // serving the new types. |
| 37 const base::Feature kNewOmniboxAnswerTypes{"NewOmniboxAnswerTypes", | 37 const base::Feature kNewOmniboxAnswerTypes{"NewOmniboxAnswerTypes", |
| 38 base::FEATURE_DISABLED_BY_DEFAULT}; | 38 base::FEATURE_DISABLED_BY_DEFAULT}; |
| 39 | 39 |
| 40 // Feature used to enable the transmission of entity suggestions from GWS | 40 // Feature used to enable the transmission of entity suggestions from GWS |
| 41 // to this client. | 41 // to this client. |
| 42 const base::Feature kOmniboxEntitySuggestions{ | 42 const base::Feature kOmniboxEntitySuggestions{ |
| 43 "OmniboxEntitySuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; | 43 "OmniboxEntitySuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; |
| 44 | 44 |
| 45 // Feature used to enable the transmission of tail suggestions from GWS | |
| 46 // to this client. | |
| 47 const base::Feature kOmniboxTailSuggestions{ | |
| 48 "OmniboxTailSuggestions", base::FEATURE_DISABLED_BY_DEFAULT}; | |
|
Mark P
2017/05/31 23:17:13
Do you want an OS_ANDROID: enabled by default stat
Kevin Bailey
2017/06/01 14:32:42
I revised the comment, since all the flag does is
Mark P
2017/06/01 16:23:58
Acknowledged.
| |
| 49 | |
| 45 // Feature used to enable clipboard provider, which provides the user with | 50 // Feature used to enable clipboard provider, which provides the user with |
| 46 // suggestions of the URL in the user's clipboard (if any) upon omnibox focus. | 51 // suggestions of the URL in the user's clipboard (if any) upon omnibox focus. |
| 47 const base::Feature kEnableClipboardProvider { | 52 const base::Feature kEnableClipboardProvider { |
| 48 "OmniboxEnableClipboardProvider", | 53 "OmniboxEnableClipboardProvider", |
| 49 #if defined(OS_IOS) | 54 #if defined(OS_IOS) |
| 50 base::FEATURE_ENABLED_BY_DEFAULT | 55 base::FEATURE_ENABLED_BY_DEFAULT |
| 51 #else | 56 #else |
| 52 base::FEATURE_DISABLED_BY_DEFAULT | 57 base::FEATURE_DISABLED_BY_DEFAULT |
| 53 #endif | 58 #endif |
| 54 }; | 59 }; |
| (...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 832 if (it != params.end()) | 837 if (it != params.end()) |
| 833 return it->second; | 838 return it->second; |
| 834 // Fall back to the global instant extended context. | 839 // Fall back to the global instant extended context. |
| 835 it = params.find(rule + ":" + page_classification_str + ":*"); | 840 it = params.find(rule + ":" + page_classification_str + ":*"); |
| 836 if (it != params.end()) | 841 if (it != params.end()) |
| 837 return it->second; | 842 return it->second; |
| 838 // Look up rule in the global context. | 843 // Look up rule in the global context. |
| 839 it = params.find(rule + ":*:*"); | 844 it = params.find(rule + ":*:*"); |
| 840 return (it != params.end()) ? it->second : std::string(); | 845 return (it != params.end()) ? it->second : std::string(); |
| 841 } | 846 } |
| OLD | NEW |