|
796 | 796 | #endif // COMPONENTS_HELIUM_SERVICES_PREF_NAMES_H_ |
797 | 797 | --- a/components/omnibox/browser/omnibox_edit_model.cc |
798 | 798 | +++ b/components/omnibox/browser/omnibox_edit_model.cc |
799 | | -@@ -824,6 +824,17 @@ bool OmniboxEditModel::AcceptKeyword( |
| 799 | +@@ -826,6 +826,17 @@ bool OmniboxEditModel::AcceptKeyword( |
800 | 800 |
|
801 | 801 | controller_->StopAutocomplete(/*clear_result=*/false); |
802 | 802 |
|
|
814 | 814 | is_keyword_hint_ = false; |
815 | 815 | keyword_mode_entry_method_ = entry_method; |
816 | 816 | if (original_user_text_with_keyword_.empty()) { |
817 | | -@@ -866,9 +877,6 @@ bool OmniboxEditModel::AcceptKeyword( |
| 817 | +@@ -868,9 +879,6 @@ bool OmniboxEditModel::AcceptKeyword( |
818 | 818 | } |
819 | 819 |
|
820 | 820 | base::RecordAction(base::UserMetricsAction("AcceptedKeywordHint")); |
|
824 | 824 | EmitEnteredKeywordModeHistogram(entry_method, turl, !user_text_.empty()); |
825 | 825 | return true; |
826 | 826 | } |
827 | | -@@ -1520,7 +1528,13 @@ void OmniboxEditModel::InternalSetUserTe |
| 827 | +@@ -1522,7 +1530,13 @@ void OmniboxEditModel::InternalSetUserTe |
828 | 828 |
|
829 | 829 | std::u16string OmniboxEditModel::MaybeStripKeyword( |
830 | 830 | const std::u16string& text) const { |
|
839 | 839 | ? AutocompleteInput::SplitReplacementStringFromInput(text, false) |
840 | 840 | : text; |
841 | 841 | } |
842 | | -@@ -2779,9 +2793,8 @@ bool OmniboxEditModel::MaybeAcceptKeywor |
| 842 | +@@ -2781,9 +2795,8 @@ bool OmniboxEditModel::MaybeAcceptKeywor |
843 | 843 | return false; |
844 | 844 |
|
845 | 845 | size_t keyword_length = new_text.length() - 1; |
|
0 commit comments