Fix text and selection's save/restore issue of omnibox when displaying tempor...

chrome/browser/autocomplete/autocomplete_edit.cc

 // Copyright (c) 2006-2008 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 "base/basictypes.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
@@ skipping 438 matching lines @@
       // Save the original selection and URL so it can be reverted later.
       has_temporary_text_ = true;
       original_url_ = popup_->URLsForCurrentSelection(NULL, NULL, NULL);
       original_keyword_ui_state_ = keyword_ui_state_;
     }
     view_->OnTemporaryTextMaybeChanged(DisplayTextFromUserText(text),
                                        save_original_selection);
     return;
   }
 
+  // TODO(suzhe): It shouldn't affect inline autocomplete text at all.

[Peter Kasting, 2009/09/10 19:30:27]

Nit: The substance here is fine, the grammar is a little odd.  How about:

"TODO: Instead of messing with |inline_autocomplete_text_| here, we should
probably do it inside Observe(), and save/restore it around changes to the
temporary text.  This will let us remove knowledge of inline autocompletions
from the popup code."

+  // Instead, the edit should deal with it separately in Observe(), and
+  // save and restore it properly around setting/resetting temporary text.
+  //
   // Handle changes to inline autocomplete text.  Don't make changes if the user
   // is showing temporary text.  Making display changes would be obviously
   // wrong; making changes to the inline_autocomplete_text_ itself turns out to
   // be more subtlely wrong, because it means hitting esc will no longer revert
   // to the original state before arrowing.
   if (!has_temporary_text_) {
     inline_autocomplete_text_ = text;
     if (view_->OnInlineAutocompleteTextMaybeChanged(
         DisplayTextFromUserText(user_text_ + inline_autocomplete_text_),
         DisplayTextFromUserText(user_text_).length()))
@@ skipping 149 matching lines @@
   // Get the URLs for the default match.
   const AutocompleteResult::const_iterator match = result.default_match();
   if (transition)
     *transition = match->transition;
   if (is_history_what_you_typed_match)
     *is_history_what_you_typed_match = match->is_history_what_you_typed_match;
   if (alternate_nav_url)
     *alternate_nav_url = result.alternate_nav_url();
   return match->destination_url;
 }