Ctrl-based actions should take precedence over ctrl-enter

chrome/browser/autocomplete/autocomplete_edit.cc

 // 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.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/histogram.h"
@@ skipping 152 matching lines @@
   GetInfoForCurrentText(&match, NULL);
   *url = match.destination_url;
   if (*url == URLFixerUpper::FixupURL(WideToUTF8(permanent_text_),
                                       std::string())) {
     *title = controller_->GetTitle();
     *favicon = controller_->GetFavIcon();
   }
 }
 
 std::wstring AutocompleteEditModel::GetDesiredTLD() const {
-  return (control_key_state_ == DOWN_WITHOUT_CHANGE) ?
+  // Tricky corner case: The user has typed "foo" and currently sees an inline
+  // autocomplete suggestion of "foo.net".  He now presses ctrl-a (e.g. to
+  // select all, on Windows).  If we treat the ctrl press as potentially for the
+  // sake of ctrl-enter, then we risk "www.foo.com" being promoted as the best
+  // match.  This would make the autocompleted text disappear, leaving our user
+  // feeling very confused when the wrong text gets highlighted.
+  //
+  // Thus, we only treat the user as pressing ctrl-enter when the user presses
+  // ctrl without any fragile state built up in the omnibox:
+  // * the contents of the omnibox have not changed since the keypress,
+  // * there is no autocompleted text visible, and
+  // * the user is not typing a keyword query.
+  return (control_key_state_ == DOWN_WITHOUT_CHANGE &&
+          inline_autocomplete_text_.empty() &&
+          !KeywordIsSelected())?

[Peter Kasting, 2010/08/25 01:35:07]

Nit: Put as many conditions on one line as possible.

     std::wstring(L"com") : std::wstring();
 }
 
 bool AutocompleteEditModel::CurrentTextIsURL() const {
   // If !user_input_in_progress_, the permanent text is showing, which should
   // always be a URL, so no further checking is needed.  By avoiding checking in
   // this case, we avoid calling into the autocomplete providers, and thus
   // initializing the history system, as long as possible, which speeds startup.
   if (!user_input_in_progress_)
     return true;
@@ skipping 514 matching lines @@
 
   OnPopupDataChanged(inline_autocomplete_text, NULL, keyword, is_keyword_hint);
 }
 
 void AutocompleteEditModel::InternalSetUserText(const std::wstring& text) {
   user_text_ = text;
   just_deleted_text_ = false;
   inline_autocomplete_text_.clear();
 }
 
+bool AutocompleteEditModel::KeywordIsSelected() const {
+  return ((keyword_ui_state_ != NO_KEYWORD) && !is_keyword_hint_ &&
+          !keyword_.empty());
+}
+
 std::wstring AutocompleteEditModel::DisplayTextFromUserText(
     const std::wstring& text) const {
-  return ((keyword_ui_state_ == NO_KEYWORD) || is_keyword_hint_ ||
-          keyword_.empty()) ?
-      text : KeywordProvider::SplitReplacementStringFromInput(text);
+  return KeywordIsSelected() ?
+      KeywordProvider::SplitReplacementStringFromInput(text) : text;
 }
 
 std::wstring AutocompleteEditModel::UserTextFromDisplayText(
     const std::wstring& text) const {
-  return ((keyword_ui_state_ == NO_KEYWORD) || is_keyword_hint_ ||
-          keyword_.empty()) ?
-      text : (keyword_ + L" " + text);
+  return KeywordIsSelected() ?

[Peter Kasting, 2010/08/25 01:35:07]

Nit: This will all fit on one line.

+      (keyword_ + L" " + text) : text;
 }
 
 void AutocompleteEditModel::GetInfoForCurrentText(
     AutocompleteMatch* match,
     GURL* alternate_nav_url) const {
   if (popup_->IsOpen() || query_in_progress()) {
     popup_->InfoForCurrentSelection(match, alternate_nav_url);
   } else {
     profile_->GetAutocompleteClassifier()->Classify(
         UserTextFromDisplayText(view_->GetText()), GetDesiredTLD(), match,
         alternate_nav_url);
   }
 }