Makes copying text in the omnibox always use permanent text is the

chrome/browser/autocomplete/autocomplete_edit.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.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 367 matching lines @@
 void AutocompleteEditModel::AdjustTextForCopy(int sel_min,
                                               bool is_all_selected,
                                               string16* text,
                                               GURL* url,
                                               bool* write_url) {
   *write_url = false;
 
   if (sel_min != 0)
     return;
 
+  if (!user_input_in_progress() && is_all_selected) {
+    // The user selected all the text and has not edited it. Use the url as the
+    // text so that if the scheme was stripped it's added back, and the url
+    // is unescaped (we escape parts of the url for display).
+    *url = PermanentURL();
+    *text = UTF8ToUTF16(url->spec());
+    *write_url = true;
+    return;
+  }
+
   // We can't use CurrentTextIsURL() or GetDataForURLExport() because right now
   // the user is probably holding down control to cause the copy, which will
   // screw up our calculation of the desired_tld.
   if (!GetURLForText(*text, url))

[Peter Kasting, 2011/08/30 21:30:52]

Inlining this function into here is fine with me.

     return;  // Can't be parsed as a url, no need to adjust text.
 
-  if (!user_input_in_progress() && is_all_selected) {
-    // The user selected all the text and has not edited it. Use the url as the
-    // text so that if the scheme was stripped it's added back, and the url
-    // is unescaped (we escape parts of the url for display).
-    *text = UTF8ToUTF16(url->spec());
-    *write_url = true;
-    return;
-  }
-
   // Prefix the text with 'http://' if the text doesn't start with 'http://',
   // the text parses as a url with a scheme of http, the user selected the
   // entire host, and the user hasn't edited the host or manually removed the
   // scheme.
-  GURL perm_url;
-  if (GetURLForText(permanent_text_, &perm_url) &&
-      perm_url.SchemeIs(chrome::kHttpScheme) &&
-      url->SchemeIs(chrome::kHttpScheme) &&
-      perm_url.host() == url->host()) {
+  GURL perm_url(PermanentURL());
+  if (perm_url.SchemeIs(chrome::kHttpScheme) &&
+      url->SchemeIs(chrome::kHttpScheme) && perm_url.host() == url->host()) {
     *write_url = true;
-
     string16 http = ASCIIToUTF16(chrome::kHttpScheme) +
         ASCIIToUTF16(chrome::kStandardSchemeSeparator);
     if (text->compare(0, http.length(), http) != 0)
       *text = http + *text;
   }
 }
 
 void AutocompleteEditModel::SetInputInProgress(bool in_progress) {
   if (user_input_in_progress_ == in_progress)
     return;
@@ skipping 544 matching lines @@
     InfoForCurrentSelection(match, alternate_nav_url);
   } else {
     profile_->GetAutocompleteClassifier()->Classify(
         UserTextFromDisplayText(view_->GetText()), GetDesiredTLD(),
         KeywordIsSelected(), true, match, alternate_nav_url);
   }
 }
 
 bool AutocompleteEditModel::GetURLForText(const string16& text,
                                           GURL* url) const {
-  GURL parsed_url;
-  const AutocompleteInput::Type type = AutocompleteInput::Parse(
-      UserTextFromDisplayText(text), string16(), NULL, NULL, &parsed_url);
-  if (type != AutocompleteInput::URL)
-    return false;
-
-  *url = parsed_url;
-  return true;
+  AutocompleteMatch match;
+  profile_->GetAutocompleteClassifier()->Classify(text, string16(),
+        KeywordIsSelected(), true, &match, NULL);
+  *url = match.destination_url;
+  return url->is_valid();

[Peter Kasting, 2011/08/30 21:30:52]

This should be:

  return match.transition == PageTransition::TYPED;

This will only be true when the url is valid, and it will reject cases where we
don't navigate by default.  The reason this is important is because otherwise,
if I'm currently on a Google search result page, and I type "foo" in the omnibox
and copy it, this function will return a destination URL that's a Google search
for "foo" and the caller will happily prepend "http://" because the hosts match.

 }
 
 void AutocompleteEditModel::RevertTemporaryText(bool revert_popup) {
   // The user typed something, then selected a different item.  Restore the
   // text they typed and change back to the default item.
   // NOTE: This purposefully does not reset paste_state_.
   just_deleted_text_ = false;
   has_temporary_text_ = false;
   if (revert_popup)
     popup_->ResetToDefaultMatch();
@@ skipping 98 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }