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

chrome/browser/autocomplete/autocomplete_popup_model.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_popup_model.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/profile.h"
@@ skipping 91 matching lines @@
   }
 
   if (line == selected_line_)
     return;  // Nothing else to do.
 
   // Update the edit with the new data for this match.
   // TODO(pkasting): If |selected_line_| moves to the controller, this can be
   // eliminated and just become a call to the observer on the edit.
   std::wstring keyword;
   const bool is_keyword_hint = GetKeywordForMatch(match, &keyword);
-  edit_model_->OnPopupDataChanged(
-      reset_to_default ? std::wstring() : match.fill_into_edit,
-      !reset_to_default, keyword, is_keyword_hint, match.type);
+
+  if (reset_to_default) {
+    std::wstring inline_autocomplete_text;
+    if ((match.inline_autocomplete_offset != std::wstring::npos) &&
+        (match.inline_autocomplete_offset < match.fill_into_edit.length())) {
+      inline_autocomplete_text =
+          match.fill_into_edit.substr(match.inline_autocomplete_offset);
+    }
+    edit_model_->OnPopupDataChanged(inline_autocomplete_text, false,
+                                    keyword, is_keyword_hint, match.type);
+  } else {
+    edit_model_->OnPopupDataChanged(match.fill_into_edit, true,
+                                    keyword, is_keyword_hint, match.type);
+  }
 
   // Repaint old and new selected lines immediately, so that the edit doesn't
   // appear to update [much] faster than the popup.  We must not update
   // |selected_line_| before calling OnPopupDataChanged() (since the edit may
   // call us back to get data about the old selection), and we must not call
   // UpdateWindow() before updating |selected_line_| (since the paint routine
   // relies on knowing the correct selected line).
   //
   // NOTE: We should never reach here with no selected line; the same code that
   // opened the popup and made it possible to get here should have also set a
@@ skipping 142 matching lines @@
   // There had better not be a nonempty result set with no default match.
   CHECK((selected_line_ != kNoMatch) || result->empty());
   // If we're going to trim the window size to no longer include the hovered
   // line, turn hover off.  Practically, this shouldn't happen, but it
   // doesn't hurt to be defensive.
   if ((hovered_line_ != kNoMatch) && (result->size() <= hovered_line_))
     SetHoveredLine(kNoMatch);
 
   view_->UpdatePopupAppearance();
 }