Instant extended: Remove suggest commit on lost focus

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/string_util.h"
@@ skipping 351 matching lines @@
   FocusLocation(false);
   model()->SetCaretVisibility(true);
 }
 
 void OmniboxViewMac::ApplyCaretVisibility() {
   [[field_ cell] setHideFocusState:!model()->is_caret_visible()
                             ofView:field_];
 }
 
 void OmniboxViewMac::SetText(const string16& display_text) {
-  // If we are setting the text directly, there cannot be any suggest text.
-  SetInstantSuggestion(string16());
   SetTextInternal(display_text);
 }
 
 void OmniboxViewMac::SetTextInternal(const string16& display_text) {
   NSString* ss = base::SysUTF16ToNSString(display_text);
   NSMutableAttributedString* as =
       [[[NSMutableAttributedString alloc] initWithString:ss] autorelease];
 
   ApplyTextAttributes(display_text, as);
   [field_ setAttributedStringValue:as];
@@ skipping 104 matching lines @@
                range:ComponentToNSRange(scheme)];
   }
 }
 
 void OmniboxViewMac::OnTemporaryTextMaybeChanged(const string16& display_text,
                                                  bool save_original_selection,
                                                  bool notify_text_changed) {
   if (save_original_selection)
     saved_temporary_selection_ = GetSelectedRange();
 
-  SetInstantSuggestion(string16());
   SetWindowTextAndCaretPos(display_text, display_text.size(), false, false);
   if (notify_text_changed)
     model()->OnChanged();
   [field_ clearUndoChain];
 }
 
 void OmniboxViewMac::OnStartingIME() {

[Peter Kasting, 2013/04/03 00:35:35]

Can this function be eliminated entirely?

[sail, 2013/04/03 19:34:11]

Done.
Good idea.

-  // Reset the suggest text just before starting an IME composition session,
-  // otherwise the IME composition may be interrupted when the suggest text
-  // gets reset by the IME composition change.
-  SetInstantSuggestion(string16());
 }
 
 bool OmniboxViewMac::OnInlineAutocompleteTextMaybeChanged(
     const string16& display_text,
     size_t user_text_length) {
   // TODO(shess): Make sure that this actually works.  The round trip
   // to native form and back may mean that it's the same but not the
   // same.
   if (display_text == GetText())
     return false;
@@ skipping 121 matching lines @@
 void OmniboxViewMac::OnDidChange() {
   // Figure out what changed and notify the model.
   OnAfterPossibleChange();
 }
 
 void OmniboxViewMac::OnDidEndEditing() {
   ClosePopup();
 }
 
 bool OmniboxViewMac::OnDoCommandBySelector(SEL cmd) {
-  if (cmd != @selector(moveRight:) &&
-      cmd != @selector(insertTab:) &&
-      cmd != @selector(insertTabIgnoringFieldEditor:)) {
-    // Reset the suggest text for any change other than key right or tab.
-    // TODO(rohitrao): This is here to prevent complications when editing text.
-    // See if this can be removed.
-    SetInstantSuggestion(string16());
-  }
-
   if (cmd == @selector(deleteForward:))
     delete_was_pressed_ = true;
 
   if (cmd == @selector(moveDown:)) {
     model()->OnUpOrDownKeyPressed(1);
     return true;
   }
 
   if (cmd == @selector(moveUp:)) {
     model()->OnUpOrDownKeyPressed(-1);
@@ skipping 306 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();
 }