Accept keyword by pressing space.

chrome/browser/autocomplete/autocomplete_edit_view_win.cc

 // Copyright (c) 2011 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_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 843 matching lines @@
   CHARRANGE new_sel;
   GetSelection(new_sel);
   const int length = GetTextLength();
   if ((new_sel.cpMin > length) || (new_sel.cpMax > length)) {
     if (new_sel.cpMin > length)
       new_sel.cpMin = length;
     if (new_sel.cpMax > length)
       new_sel.cpMax = length;
     SetSelectionRange(new_sel);
   }
-  const bool selection_differs = (new_sel.cpMin != sel_before_change_.cpMin) ||
-      (new_sel.cpMax != sel_before_change_.cpMax);
+  const bool selection_differs =
+      ((new_sel.cpMin != new_sel.cpMax) ||

[Peter Kasting, 2011/01/20 00:04:22]

Nit: I suggest using a similar addition to this in the GTK code rather than
adding an empty() function.

[James Su, 2011/01/20 06:49:31]

Done.

+       (sel_before_change_.cpMin != sel_before_change_.cpMax)) &&
+      ((new_sel.cpMin != sel_before_change_.cpMin) ||
+       (new_sel.cpMax != sel_before_change_.cpMax));
   const bool at_end_of_edit =
       (new_sel.cpMin == length) && (new_sel.cpMax == length);
 
   // See if the text or selection have changed since OnBeforePossibleChange().
   const std::wstring new_text(GetText());
   const bool text_differs = (new_text != text_before_change_) ||
       force_text_changed;
 
   // When the user has deleted text, we don't allow inline autocomplete.  Make
   // sure to not flag cases like selecting part of the text and then pasting
@@ skipping 809 matching lines @@
   memory_dc.SelectBitmap(old_bitmap);
   edit_hwnd = old_edit_hwnd;
 }
 
 void AutocompleteEditViewWin::OnPaste() {
   // Replace the selection if we have something to paste.
   const std::wstring text(GetClipboardText());
   if (!text.empty()) {
     // If this paste will be replacing all the text, record that, so we can do
     // different behaviors in such a case.
-    if (IsSelectAll())
-      model_->on_paste_replacing_all();
+    model_->OnPaste(IsSelectAll());
     // Force a Paste operation to trigger the text_changed code in
     // OnAfterPossibleChange(), even if identical contents are pasted into the
     // text box.
     text_before_change_.clear();
     ReplaceSel(text.c_str(), true);
   }
 }
 
 void AutocompleteEditViewWin::OnRButtonDblClk(UINT /*keys*/,
                                               const CPoint& /*point*/) {
@@ skipping 258 matching lines @@
       }
 
       // We're showing a keyword and the user pressed backspace at the beginning
       // of the text. Delete the selected keyword.
       ScopedFreeze freeze(this, GetTextObjectModel());
       model_->ClearKeyword(GetText());
       return true;
     }
 
     case VK_TAB: {
-      if (model_->is_keyword_hint() && !model_->keyword().empty()) {
+      if (model_->is_keyword_hint()) {
         // Accept the keyword.
         ScopedFreeze freeze(this, GetTextObjectModel());
         model_->AcceptKeyword();
       } else {
         controller_->OnCommitSuggestedText(GetText());
       }
       return true;
     }
 
     case 0xbb:  // Ctrl-'='.  Triggers subscripting (even in plain text mode).
@@ skipping 574 matching lines @@
 }
 
 int AutocompleteEditViewWin::WidthNeededToDisplay(
     const std::wstring& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }