Interpret '?' and Ctrl-K or Ctrl-E as putting omnibox in keyword search mode for Default Search Pro…

chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index dd9cdba9a22e43272801b813c2f35418a4ff7147..7774e0aa97294f929b550f61d268545a756edb1d 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -277,13 +277,12 @@ void OmniboxViewViews::SetUserText(const base::string16& text,
   OmniboxView::SetUserText(text, display_text, update_popup);
 }
 
-void OmniboxViewViews::SetForcedQuery() {
-  const base::string16 current_text(text());
-  const size_t start = current_text.find_first_not_of(base::kWhitespaceUTF16);
-  if (start == base::string16::npos || (current_text[start] != '?'))
-    OmniboxView::SetUserText(base::ASCIIToUTF16("?"));
-  else
-    SelectRange(gfx::Range(current_text.size(), start + 1));
+void OmniboxViewViews::EnterKeywordModeForDefaultSearchProvider() {
+  // Transition the user into keyword mode using their default search provider.
+  // Select their query if they typed one.
+  model()->EnterKeywordModeForDefaultSearchProvider(
+      KeywordModeEntryMethod::KEYBOARD_SHORTCUT);
+  SelectRange(gfx::Range(text().size(), 0));
 }
 
 void OmniboxViewViews::GetSelectionBounds(
@@ -419,7 +418,7 @@ bool OmniboxViewViews::HandleEarlyTabActions(const ui::KeyEvent& event) {
     return false;
 
   if (model()->is_keyword_hint() && !event.IsShiftDown())
-    return model()->AcceptKeyword(ENTERED_KEYWORD_MODE_VIA_TAB);
+    return model()->AcceptKeyword(KeywordModeEntryMethod::TAB);
 
   if (!model()->popup_model()->IsOpen())
     return false;
@@ -456,6 +455,10 @@ void OmniboxViewViews::SetWindowTextAndCaretPos(const base::string16& text,
     TextChanged();
 }
 
+void OmniboxViewViews::SetCaretPos(size_t caret_pos) {
+  SelectRange(gfx::Range(caret_pos, caret_pos));
+}
+
 bool OmniboxViewViews::IsSelectAll() const {
   // TODO(oshima): IME support.
   return text() == GetSelectedText();
@@ -525,6 +528,8 @@ void OmniboxViewViews::OnRevertTemporaryText() {
 void OmniboxViewViews::OnBeforePossibleChange() {
   // Record our state.
   text_before_change_ = text();
+  keyword_before_change_ = model()->keyword();
+  is_keyword_selected_before_change_ = model()->is_keyword_selected();
   sel_before_change_ = GetSelectedRange();
   ime_composing_before_change_ = IsIMEComposing();
 }
@@ -532,9 +537,15 @@ void OmniboxViewViews::OnBeforePossibleChange() {
 bool OmniboxViewViews::OnAfterPossibleChange(bool allow_keyword_ui_change) {
   // See if the text or selection have changed since OnBeforePossibleChange().
   const base::string16 new_text = text();
+  const base::string16 new_keyword = model()->keyword();
+  const bool new_is_keyword_selected = model()->is_keyword_selected();
   const gfx::Range new_sel = GetSelectedRange();
   const bool text_changed = (new_text != text_before_change_) ||
       (ime_composing_before_change_ != IsIMEComposing());
+  const bool keyword_changed =
+      (new_is_keyword_selected != is_keyword_selected_before_change_) ||
+      (new_is_keyword_selected && is_keyword_selected_before_change_ &&
+       new_keyword != keyword_before_change_);
   const bool selection_differs =
       !((sel_before_change_.is_empty() && new_sel.is_empty()) ||
         sel_before_change_.EqualsIgnoringDirection(new_sel));
@@ -550,14 +561,14 @@ bool OmniboxViewViews::OnAfterPossibleChange(bool allow_keyword_ui_change) {
 
   const bool something_changed = model()->OnAfterPossibleChange(
       text_before_change_, new_text, new_sel.start(), new_sel.end(),
-      selection_differs, text_changed, just_deleted_text,
+      selection_differs, text_changed, keyword_changed, just_deleted_text,
       allow_keyword_ui_change && !IsIMEComposing());
 
   // If only selection was changed, we don't need to call model()'s
   // OnChanged() method, which is called in TextChanged().
   // But we still need to call EmphasizeURLComponents() to make sure the text
   // attributes are updated correctly.
-  if (something_changed && text_changed)
+  if (something_changed && (text_changed || keyword_changed))
     TextChanged();
   else if (selection_differs)
     EmphasizeURLComponents();