Hitting Tab should always move cursor to end of omnibox text.

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2010 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/autocomplete/autocomplete_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 
 #include "app/mac/nsimage_cache.h"
 #include "base/string_util.h"
@@ skipping 426 matching lines @@
 void AutocompleteEditViewMac::ClosePopup() {
   if (popup_view_->GetModel()->IsOpen())
     controller_->OnAutocompleteWillClosePopup();
 
   popup_view_->GetModel()->StopAutocomplete();
 }
 
 void AutocompleteEditViewMac::SetFocus() {
 }
 
-bool AutocompleteEditViewMac::CommitSuggestText() {
-  if (suggest_text_length_ == 0)
-    return false;
-
-  string16 input_text(GetText());
-  suggest_text_length_ = 0;
-  string16 text(GetText());
-  // Call SetText() to force a redraw and move the cursor to the end.
-  SetText(text);
-  model()->FinalizeInstantQuery(input_text, text.substr(input_text.size()));
-  return true;
-}
-
 void AutocompleteEditViewMac::SetText(const string16& display_text) {
   // If we are setting the text directly, there cannot be any suggest text.
   suggest_text_length_ = 0;
   SetTextInternal(display_text);
 }
 
 void AutocompleteEditViewMac::SetTextInternal(
     const string16& display_text) {
   NSString* ss = base::SysUTF16ToNSString(display_text);
   NSMutableAttributedString* as =
@@ skipping 30 matching lines @@
   NSString* text = [field_ stringValue];
   if (suggest_text_length_ > 0) {
     NSUInteger length = [text length];
 
     DCHECK_LE(suggest_text_length_, length);
     text = [text substringToIndex:(length - suggest_text_length_)];
   }
   return text;
 }
 
+NSString* AutocompleteEditViewMac::GetSuggestTextSubstring() const {
+  if (suggest_text_length_ == 0)
+    return nil;
+
+  NSString* text = [field_ stringValue];
+  NSUInteger length = [text length];
+  DCHECK_LE(suggest_text_length_, length);
+  return [text substringFromIndex:(length - suggest_text_length_)];
+}
+
 void AutocompleteEditViewMac::EmphasizeURLComponents() {
   NSTextView* editor = (NSTextView*)[field_ currentEditor];
   // If the autocomplete text field is in editing mode, then we can just change
   // its attributes through its editor. Otherwise, we simply reset its content.
   if (editor) {
     NSTextStorage* storage = [editor textStorage];
     [storage beginEditing];
 
     // Clear the existing attributes from the text storage, then
     // overlay the appropriate Omnibox attributes.
@@ skipping 196 matching lines @@
   if (needs_update) {
     NSRange current_range = GetSelectedRange();
     SetTextInternal(base::SysNSStringToUTF16(text));
     if (NSMaxRange(current_range) <= [text length] - suggest_text_length_)
       SetSelectedRange(current_range);
     else
       SetSelectedRange(NSMakeRange([text length] - suggest_text_length_, 0));
   }
 }
 
+string16 AutocompleteEditViewMac::GetInstantSuggestion() const {
+  return suggest_text_length_ ?
+      base::SysNSStringToUTF16(GetSuggestTextSubstring()) : string16();
+}
+
 int AutocompleteEditViewMac::TextWidth() const {
   // Not used on mac.
   NOTREACHED();
   return 0;
 }
 
 bool AutocompleteEditViewMac::IsImeComposing() const {
   return [(NSTextView*)[field_ currentEditor] hasMarkedText];
 }
 
@@ skipping 47 matching lines @@
   }
 
   if (cmd == @selector(moveRight:)) {
     // Only commit suggested text if the cursor is all the way to the right and
     // there is no selection.
     NSRange range = GetSelectedRange();
     if (range.length == 0 &&
         suggest_text_length_ > 0 &&
         (range.location + suggest_text_length_ ==
          [[field_ stringValue] length])) {
-      controller_->OnCommitSuggestedText(GetText());
+      controller_->OnCommitSuggestedText(true);
       return true;
     }
   }
 
   if (cmd == @selector(scrollPageDown:)) {
     model_->OnUpOrDownKeyPressed(model_->result().size());
     return true;
   }
 
   if (cmd == @selector(scrollPageUp:)) {
     model_->OnUpOrDownKeyPressed(-model_->result().size());
     return true;
   }
 
   if (cmd == @selector(cancelOperation:)) {
     return model_->OnEscapeKeyPressed();
   }
 
   if (cmd == @selector(insertTab:) ||
       cmd == @selector(insertTabIgnoringFieldEditor:)) {
     if (model_->is_keyword_hint())
       return model_->AcceptKeyword();
 
     if (suggest_text_length_ > 0) {
-      controller_->OnCommitSuggestedText(GetText());
+      controller_->OnCommitSuggestedText(true);
       return true;
     }
 
+    NSRange selected_range = GetSelectedRange();
+    NSUInteger length = [[[field_ currentEditor] string] length];
+    if (selected_range.length != 0 || selected_range.location < length) {
+      [[field_ currentEditor] setSelectedRange:NSMakeRange(length, length)];
+      // OnDidChange() will not be triggered when setting selected range in this
+      // method, so we need to call it explicitly.
+      OnDidChange();
+      return true;
+    }
+
     if (controller_->AcceptCurrentInstantPreview())
       return true;
   }
 
   // |-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 keyCode] == kVK_Return)) {
     WindowOpenDisposition disposition =
@@ skipping 255 matching lines @@
   }
 
   return string16();
 }
 
 // static
 NSFont* AutocompleteEditViewMac::GetFieldFont() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetFont(ResourceBundle::BaseFont).GetNativeFont();
 }