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

components/omnibox/browser/omnibox_edit_model.h

Index: components/omnibox/browser/omnibox_edit_model.h
diff --git a/components/omnibox/browser/omnibox_edit_model.h b/components/omnibox/browser/omnibox_edit_model.h
index c4d6d2d5af560196cfcdfc2cd174cf80d38a734e..8428fa65e61d46511348276578664ce95beab937 100644
--- a/components/omnibox/browser/omnibox_edit_model.h
+++ b/components/omnibox/browser/omnibox_edit_model.h
@@ -37,11 +37,13 @@ class Rect;
 
 // Reasons why the Omnibox could change into keyword mode.
 // These numeric values are used in UMA logs; do not change them.
-enum EnteredKeywordModeMethod {
-  ENTERED_KEYWORD_MODE_VIA_TAB = 0,
-  ENTERED_KEYWORD_MODE_VIA_SPACE_AT_END = 1,
-  ENTERED_KEYWORD_MODE_VIA_SPACE_IN_MIDDLE = 2,
-  ENTERED_KEYWORD_MODE_NUM_ITEMS
+enum class KeywordModeEntryMethod {
+  TAB = 0,
+  SPACE_AT_END = 1,
+  SPACE_IN_MIDDLE = 2,
+  KEYBOARD_SHORTCUT = 3,
+  QUESTION_MARK = 4,
+  NUM_ITEMS,
 };
 
 class OmniboxEditModel {
@@ -60,6 +62,7 @@ class OmniboxEditModel {
           const base::string16& gray_text,
           const base::string16& keyword,
           bool is_keyword_hint,
+          KeywordModeEntryMethod keyword_mode_entry_method,
           bool url_replacement_enabled,
           OmniboxFocusState focus_state,
           FocusSource focus_source,
@@ -72,6 +75,7 @@ class OmniboxEditModel {
     const base::string16 gray_text;
     const base::string16 keyword;
     const bool is_keyword_hint;
+    KeywordModeEntryMethod keyword_mode_entry_method;
     bool url_replacement_enabled;
     OmniboxFocusState focus_state;
     FocusSource focus_source;
@@ -237,10 +241,14 @@ class OmniboxEditModel {
   }
 
   // Accepts the current keyword hint as a keyword. It always returns true for
-  // caller convenience. |entered_method| indicates how the use entered
-  // keyword mode. This parameter is only used for metrics/logging; it's not
-  // used to change user-visible behavior.
-  bool AcceptKeyword(EnteredKeywordModeMethod entered_method);
+  // caller convenience. |entered_method| indicates how the user entered
+  // keyword mode.
+  bool AcceptKeyword(KeywordModeEntryMethod keyword_mode_entry_method);

[Peter Kasting, 2016/04/28 21:24:41]

Nit: For brevity I'd name the arg here and below |entry_method|

[Tom (Use chromium acct), 2016/04/29 01:10:21]

Done.

+
+  // Sets the current keyword to that of the user's default search provider and
+  // updates the view so the user sees the keyword chip in the omnibox.
+  void EnterKeywordModeForDefaultSearchProvider(
+      KeywordModeEntryMethod keyword_mode_entry_method);
 
   // Accepts the current temporary text as the user text.
   void AcceptTemporaryTextAsUserText();
@@ -336,6 +344,7 @@ class OmniboxEditModel {
                              size_t selection_end,
                              bool selection_differs,
                              bool text_differs,
+                             bool keyword_differs,
                              bool just_deleted_text,
                              bool allow_keyword_ui_change);
 
@@ -509,6 +518,11 @@ class OmniboxEditModel {
   bool just_deleted_text_;
   base::string16 inline_autocomplete_text_;
 
+  // Set when the user is in the process of exiting keyword mode.  This is
+  // useful to ensure we don't toggle back into keyword mode in the process of
+  // handling the current event.
+  bool clearing_keyword_;
+
   // Used by OnPopupDataChanged to keep track of whether there is currently a
   // temporary text.
   //
@@ -547,6 +561,11 @@ class OmniboxEditModel {
   // keyword_ to show a "Press <tab> to search" sort of hint.
   bool is_keyword_hint_;
 
+  // Indicates how the user entered keyword mode if the user is actually in
+  // keyword mode.  Otherwise, the value of this variable is undefined.  This
+  // is used to restore the user's search terms upon a call to ClearKeyword().
+  KeywordModeEntryMethod keyword_mode_entry_method_;
+
   // This is needed to properly update the SearchModel state when the user
   // presses escape.
   bool in_revert_;