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

components/omnibox/browser/omnibox_view.h

Index: components/omnibox/browser/omnibox_view.h
diff --git a/components/omnibox/browser/omnibox_view.h b/components/omnibox/browser/omnibox_view.h
index 462070f53bbace1d8ba5d7db571c993bc5c9d973..537e3ae86986a35d60cd1f258fc09a9107e0570a 100644
--- a/components/omnibox/browser/omnibox_view.h
+++ b/components/omnibox/browser/omnibox_view.h
@@ -35,6 +35,21 @@ namespace gfx {
 enum class VectorIconId;
 }
 
+// Represents the changes between two State objects.  This is used by the
+// model to determine how its internal state should be updated after the view
+// state changes.  See OmniboxEditModel::OnAfterPossibleChange().
+struct OmniboxViewStateChanges {

[Peter Kasting, 2016/06/05 01:20:27]

Rather than declare this outside OmniboxView, can we just flip the includes
around and have OmniboxEditModel #include this header, and this header
forward-declare that class (and then have the .cc file #include the relevant
header)?  It looks like the only uses of OmniboxEditModel in this file are ones
that should work with forward-declarations.

+  // |old_text| and |new_text| are not owned.
+  const base::string16* old_text;
+  const base::string16* new_text;
+  size_t new_sel_start;
+  size_t new_sel_end;
+  bool selection_differs;
+  bool text_differs;
+  bool keyword_differs;
+  bool just_deleted_text;
+};
+
 class OmniboxView {
  public:
   virtual ~OmniboxView();
@@ -95,14 +110,9 @@ class OmniboxView {
                                         bool update_popup,
                                         bool notify_text_changed) = 0;
 
-  // Sets the edit to forced query mode.  Practically speaking, this means that
-  // if the edit is not in forced query mode, its text is set to "?" with the
-  // cursor at the end, and if the edit is in forced query mode (its first
-  // non-whitespace character is '?'), the text after the '?' is selected.
-  //
-  // In the future we should display the search engine UI for the default engine
-  // rather than '?'.
-  virtual void SetForcedQuery() = 0;
+  // Transitions the user into keyword mode with their default search provider,
+  // preserving and selecting the user's text if they already typed in a query.
+  virtual void EnterKeywordModeForDefaultSearchProvider() = 0;
 
   // Returns true if all text is selected or there is no text at all.
   virtual bool IsSelectAll() const = 0;
@@ -239,9 +249,26 @@ class OmniboxView {
   static base::string16 SanitizeTextForPaste(const base::string16& text);
 
  protected:
+  // Tracks important state that may change between OnBeforePossibleChange() and
+  // OnAfterPossibleChange().
+  struct State {
+    base::string16 text;
+    base::string16 keyword;
+    bool is_keyword_selected;
+    size_t sel_start;
+    size_t sel_end;
+  };
+
   OmniboxView(OmniboxEditController* controller,
               std::unique_ptr<OmniboxClient> client);
 
+  // Fills |state| with the current text state.
+  void GetState(State* state);
+
+  // Returns the delta between |before| and |after|.
+  OmniboxViewStateChanges GetStateChanges(const State& before,
+                                          const State& after);
+
   // Internally invoked whenever the text changes in some way.
   virtual void TextChanged();