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

 // 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.
 
 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "base/mac/foundation_util.h"
 #include "base/memory/ptr_util.h"
@@ skipping 340 matching lines @@
   DCHECK_LE(caret_pos, text.size());
   SetTextAndSelectedRange(text, NSMakeRange(caret_pos, 0));
 
   if (update_popup)
     UpdatePopup();
 
   if (notify_text_changed)
     TextChanged();
 }
 
-void OmniboxViewMac::SetForcedQuery() {
+void OmniboxViewMac::SetCaretPos(size_t caret_pos) {
+  [[field_ currentEditor] setSelectedRange:NSMakeRange(caret_pos, 0)];
+}
+
+void OmniboxViewMac::EnterKeywordModeForDefaultSearchProvider() {
   // We need to do this first, else |SetSelectedRange()| won't work.
   FocusLocation(true);
 
-  const base::string16 current_text(GetText());
-  const size_t start = current_text.find_first_not_of(base::kWhitespaceUTF16);
-  if (start == base::string16::npos || (current_text[start] != '?')) {
-    SetUserText(base::ASCIIToUTF16("?"));
-  } else {
-    NSRange range = NSMakeRange(start + 1, current_text.size() - start - 1);
-    [[field_ currentEditor] setSelectedRange:range];
-  }
+  // Transition the user into keyword mode using their default search provider.
+  // Select their query if they typed one.
+  model()->EnterKeywordModeForDefaultSearchProvider(
+      KeywordModeEntryMethod::KEYBOARD_SHORTCUT);
+  NSRange range = NSMakeRange(0, GetText().size());
+  [[field_ currentEditor] setSelectedRange:range];

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

Looks like these two lines are just trying to do what SelectAll() does?

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

Done.

 }
 
 bool OmniboxViewMac::IsSelectAll() const {
   if (![field_ currentEditor])
     return true;
   const NSRange all_range = NSMakeRange(0, GetTextLength());
   return NSEqualRanges(all_range, GetSelectedRange());
 }
 
 bool OmniboxViewMac::DeleteAtEndPressed() {
@@ skipping 271 matching lines @@
 bool OmniboxViewMac::IsFirstResponder() const {
   return [field_ currentEditor] != nil ? true : false;
 }
 
 void OmniboxViewMac::OnBeforePossibleChange() {
   // We should only arrive here when the field is focused.
   DCHECK(IsFirstResponder());
 
   selection_before_change_ = GetSelectedRange();
   text_before_change_ = GetText();
+  keyword_before_change_ = model()->keyword();
+  is_keyword_selected_before_change_ = model()->is_keyword_selected();
   marked_range_before_change_ = GetMarkedRange();
 }
 
 bool OmniboxViewMac::OnAfterPossibleChange(bool allow_keyword_ui_change) {
   // We should only arrive here when the field is focused.
   DCHECK(IsFirstResponder());
 
   const NSRange new_selection(GetSelectedRange());
   const base::string16 new_text(GetText());
+  const base::string16 new_keyword(model()->keyword());
+  const bool new_is_keyword_selected = model()->is_keyword_selected();
   const size_t length = new_text.length();
 
   const bool selection_differs =
       (new_selection.length || selection_before_change_.length) &&
       !NSEqualRanges(new_selection, selection_before_change_);
   const bool at_end_of_edit = (length == new_selection.location);
   const bool text_differs = (new_text != text_before_change_) ||
       !NSEqualRanges(marked_range_before_change_, GetMarkedRange());
+  const bool keyword_differs =
+      (new_is_keyword_selected != is_keyword_selected_before_change_) ||
+      (new_is_keyword_selected && is_keyword_selected_before_change_ &&
+       new_keyword != keyword_before_change_);
 
   // When the user has deleted text, we don't allow inline
   // autocomplete.  This is assumed if the text has gotten shorter AND
   // the selection has shifted towards the front of the text.  During
   // normal typing the text will almost always be shorter (as the new
   // input replaces the autocomplete suggestion), but in that case the
   // selection point will have moved towards the end of the text.
   // TODO(shess): In our implementation, we can catch -deleteBackward:
   // and other methods to provide positive knowledge that a delete
   // occurred, rather than intuiting it from context.  Consider whether
   // that would be a stronger approach.
   const bool just_deleted_text =
       (length < text_before_change_.length() &&
        new_selection.location <= selection_before_change_.location);
 
   delete_at_end_pressed_ = false;
 
   const bool something_changed = model()->OnAfterPossibleChange(
       text_before_change_, new_text, new_selection.location,
       NSMaxRange(new_selection), selection_differs, text_differs,
-      just_deleted_text, allow_keyword_ui_change && !IsImeComposing());
+      keyword_differs, just_deleted_text,
+      allow_keyword_ui_change && !IsImeComposing());
 
   if (delete_was_pressed_ && at_end_of_edit)
     delete_at_end_pressed_ = true;
 
   // Restyle in case the user changed something.
   // TODO(shess): I believe there are multiple-redraw cases, here.
   // Linux watches for something_changed && text_differs, but that
   // fails for us in case you copy the URL and paste the identical URL
   // back (we'll lose the styling).
   TextChanged();
@@ skipping 127 matching lines @@
     return true;
   }
 
   if (cmd == @selector(cancelOperation:)) {
     return model()->OnEscapeKeyPressed();
   }
 
   if ((cmd == @selector(insertTab:) ||
       cmd == @selector(insertTabIgnoringFieldEditor:)) &&
       model()->is_keyword_hint()) {
-    return model()->AcceptKeyword(ENTERED_KEYWORD_MODE_VIA_TAB);
+    return model()->AcceptKeyword(KeywordModeEntryMethod::TAB);
   }
 
   // |-noop:| is sent when the user presses Cmd+Return. Override the no-op
   // behavior with the proper WindowOpenDisposition.
   NSEvent* event = [NSApp currentEvent];
   if (cmd == @selector(insertNewline:) ||
      (cmd == @selector(noop:) &&
       ([event type] == NSKeyDown || [event type] == NSKeyUp) &&
       [event keyCode] == kVK_Return)) {
     WindowOpenDisposition disposition =
@@ skipping 253 matching lines @@
 
 NSUInteger OmniboxViewMac::GetTextLength() const {
   return [field_ currentEditor] ?  [[[field_ currentEditor] string] length] :
                                    [[field_ stringValue] length];
 }
 
 bool OmniboxViewMac::IsCaretAtEnd() const {
   const NSRange selection = GetSelectedRange();
   return NSMaxRange(selection) == GetTextLength();
 }