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 79d4cd5de3cfdbdfc5f30ea36465684bf2a81558..02192b4fbca62dccd042c463d167d6f775bca24f 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -90,7 +90,7 @@ class OmniboxViewViews
   void SetUserText(const base::string16& text,
                    const base::string16& display_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;
@@ -138,6 +138,7 @@ class OmniboxViewViews
                                 size_t caret_pos,
                                 bool update_popup,
                                 bool notify_text_changed) override;
+  void SetCaretPos(size_t caret_pos) override;
   bool IsSelectAll() const override;
   bool DeleteAtEndPressed() override;
   void UpdatePopup() override;
@@ -224,6 +225,8 @@ class OmniboxViewViews
 
   // Tracking state before and after a possible change.
   base::string16 text_before_change_;
+  base::string16 keyword_before_change_;
+  bool is_keyword_selected_before_change_;
   gfx::Range sel_before_change_;
   bool ime_composing_before_change_;