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

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 #define CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #include "components/omnibox/browser/omnibox_view.h"
 #include "components/security_state/security_state_model.h"
+#include "third_party/skia/include/core/SKColor.h"
 
 class CommandUpdater;
 class OmniboxPopupView;
 class Profile;
 
 namespace content {
 class WebContents;
 }
 
 namespace ui {
@@ skipping 31 matching lines @@
   void OpenMatch(const AutocompleteMatch& match,
                  WindowOpenDisposition disposition,
                  const GURL& alternate_nav_url,
                  const base::string16& pasted_text,
                  size_t selected_line) override;
   base::string16 GetText() const override;
   void SetWindowTextAndCaretPos(const base::string16& text,
                                 size_t caret_pos,
                                 bool update_popup,
                                 bool notify_text_changed) override;
-  void SetForcedQuery() override;
+  void EnterKeywordModeForDefaultSearchProvider() override;
   bool IsSelectAll() const override;
   bool DeleteAtEndPressed() override;
   void GetSelectionBounds(base::string16::size_type* start,
                           base::string16::size_type* end) const override;
   void SelectAll(bool reversed) override;
   void RevertAll() override;
   void UpdatePopup() override;
   void CloseOmniboxPopup() override;
   void SetFocus() override;
   void ApplyCaretVisibility() override;
@@ skipping 124 matching lines @@
   std::unique_ptr<OmniboxPopupView> popup_view_;
 
   AutocompleteTextField* field_;  // owned by tab controller
 
   // Selection at the point where the user started using the
   // arrows to move around in the popup.
   NSRange saved_temporary_selection_;
 
   // Tracking state before and after a possible change for reporting
   // to model_.
-  NSRange selection_before_change_;
-  base::string16 text_before_change_;
+  State state_before_change_;
   NSRange marked_range_before_change_;
 
   // Was delete pressed?
   bool delete_was_pressed_;
 
   // Was the delete key pressed with an empty selection at the end of the edit?
   bool delete_at_end_pressed_;
 
   base::string16 suggest_text_;
 
   // State used to coalesce changes to text and selection to avoid drawing
   // transient state.
   bool in_coalesced_update_block_;
   bool do_coalesced_text_update_;
   base::string16 coalesced_text_update_;
   bool do_coalesced_range_update_;
   NSRange coalesced_range_update_;
 
   // The time of the first character insert operation that has not yet been
   // painted. Used to measure omnibox responsiveness with a histogram.
   base::TimeTicks insert_char_time_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_OMNIBOX_OMNIBOX_VIEW_MAC_H_