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.h

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.h
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
index b12098d3e296bf865ad06f843b5990c5e8b9d5e6..19fbb8d0e49c42b055f919da092fd7ba8d20ea91 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -89,7 +89,7 @@ class OmniboxViewViews
   base::string16 GetText() const override;
   void SetUserText(const base::string16& text,
                    bool update_popup) override;
-  void SetForcedQuery() override;
+  void EnterKeywordModeForDefaultSearchProvider() override;
   void GetSelectionBounds(base::string16::size_type* start,
                           base::string16::size_type* end) const override;
   void SelectAll(bool reversed) override;
@@ -207,7 +207,7 @@ class OmniboxViewViews
   Profile* profile_;
 
   // When true, the location bar view is read only and also is has a slightly
-  // different presentation (smaller font size). This is used for popups.
+  // different presentation (smaller font size). This is used for opups.

[Peter Kasting, 2016/06/04 02:17:18]

Oops?

[Tom (Use chromium acct), 2016/06/04 20:39:09]

oops

   bool popup_window_mode_;
 
   std::unique_ptr<OmniboxPopupView> popup_view_;
@@ -222,8 +222,7 @@ class OmniboxViewViews
   gfx::Range saved_selection_for_focus_change_;
 
   // Tracking state before and after a possible change.
-  base::string16 text_before_change_;
-  gfx::Range sel_before_change_;
+  TextState text_state_before_change_;
   bool ime_composing_before_change_;
 
   // Was the delete key pressed with an empty selection at the end of the edit?