Ctrl-based actions should take precedence over ctrl-enter

chrome/browser/autocomplete/history_url_provider.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/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/histogram.h"
@@ skipping 385 matching lines @@
   // * and the user has specified a TLD,
   // * and the input _without_ the TLD _is_ in the history DB,
   // * ...then just before pressing "ctrl" the best match we supplied was the
   //   what-you-typed match, so stick with it by promoting this.
   history::URLRow info;
   if (!db->GetRowForURL(match->destination_url, &info)) {
     if (input.desired_tld().empty())
       return false;
     GURL destination_url(URLFixerUpper::FixupURL(WideToUTF8(input.text()),
                                                  std::string()));
-    if (!db->GetRowForURL(destination_url, &info))
+    if (!db->GetRowForURL(destination_url, NULL))
       return false;
+
+    // If we got here, then we hit the tricky corner case.  Make sure that
+    // |info| corresponds to the right URL.
+    info = history::URLRow(match->destination_url);
   } else {
     // We have data for this match, use it.
     match->deletable = true;
     match->description = UTF16ToWide(info.title());
     AutocompleteMatch::ClassifyMatchInString(input.text(),
         UTF16ToWide(info.title()),
         ACMatchClassification::NONE, &match->description_class);
   }
 
   // Promote as an exact match.
@@ skipping 484 matching lines @@
         &match.contents_class);
   }
   match.description = UTF16ToWide(info.title());
   AutocompleteMatch::ClassifyMatchInString(params->input.text(),
                                            UTF16ToWide(info.title()),
                                            ACMatchClassification::NONE,
                                            &match.description_class);
 
   return match;
 }