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

chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

 // Copyright (c) 2009 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_view_gtk.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
@@ skipping 320 matching lines @@
     UpdatePopup();
   TextChanged();
 }
 
 void AutocompleteEditViewGtk::SetWindowTextAndCaretPos(const std::wstring& text,
                                                        size_t caret_pos) {
   CharRange range(static_cast<int>(caret_pos), static_cast<int>(caret_pos));
   SetTextAndSelectedRange(text, range);
 }
 
-void AutocompleteEditViewGtk::SetTextAndSelectedRange(const std::wstring& text,
-                                                      const CharRange& range) {
-  std::string utf8 = WideToUTF8(text);
-  gtk_text_buffer_set_text(text_buffer_, utf8.data(), utf8.length());
-
-  GtkTextIter insert, bound;
-  ItersFromCharRange(range, &insert, &bound);
-  gtk_text_buffer_select_range(text_buffer_, &insert, &bound);
-}
-
 void AutocompleteEditViewGtk::SetForcedQuery() {
   const std::wstring current_text(GetText());
   if (current_text.empty() || (current_text[0] != '?')) {
     SetUserText(L"?");
   } else {
-    GtkTextIter start, end;
-    gtk_text_buffer_get_bounds(text_buffer_, &start, &end);
-    gtk_text_buffer_get_iter_at_offset(text_buffer_, &start, 1);
     StartUpdatingHighlightedText();
-    gtk_text_buffer_select_range(text_buffer_, &start, &end);
+    SetSelectedRange(CharRange(current_text.size(), 1));
     FinishUpdatingHighlightedText();
   }
 }
 
 bool AutocompleteEditViewGtk::IsSelectAll() {
   GtkTextIter sel_start, sel_end;
   gtk_text_buffer_get_selection_bounds(text_buffer_, &sel_start, &sel_end);
 
   GtkTextIter start, end;
   gtk_text_buffer_get_bounds(text_buffer_, &start, &end);
@@ skipping 29 matching lines @@
   model_->StartAutocomplete(std::max(sel.cp_max, sel.cp_min) < GetTextLength());
 }
 
 void AutocompleteEditViewGtk::ClosePopup() {
   popup_view_->GetModel()->StopAutocomplete();
 }
 
 void AutocompleteEditViewGtk::OnTemporaryTextMaybeChanged(
     const std::wstring& display_text,
     bool save_original_selection) {
-  if (save_original_selection) {
+  if (save_original_selection)
     saved_temporary_selection_ = GetSelection();
-    saved_temporary_text_ = GetText();
-  }
 
   StartUpdatingHighlightedText();
   SetWindowTextAndCaretPos(display_text, display_text.length());
   FinishUpdatingHighlightedText();
   TextChanged();
 }
 
 bool AutocompleteEditViewGtk::OnInlineAutocompleteTextMaybeChanged(
     const std::wstring& display_text,
     size_t user_text_length) {
   if (display_text == GetText())
     return false;
 
   StartUpdatingHighlightedText();
-  SetWindowTextAndCaretPos(display_text, 0);
-
-  // Select the part of the text that was inline autocompleted.
-  GtkTextIter bound, insert;
-  gtk_text_buffer_get_bounds(text_buffer_, &insert, &bound);
-  gtk_text_buffer_get_iter_at_offset(text_buffer_, &insert, user_text_length);
-  gtk_text_buffer_select_range(text_buffer_, &insert, &bound);
-
+  CharRange range(display_text.size(), user_text_length);
+  SetTextAndSelectedRange(display_text, range);
   FinishUpdatingHighlightedText();
   TextChanged();
   return true;
 }
 
 void AutocompleteEditViewGtk::OnRevertTemporaryText() {
   StartUpdatingHighlightedText();
-  SetTextAndSelectedRange(saved_temporary_text_, saved_temporary_selection_);
+  SetSelectedRange(saved_temporary_selection_);
   FinishUpdatingHighlightedText();
-  saved_temporary_text_.clear();
   TextChanged();
 }
 
 void AutocompleteEditViewGtk::OnBeforePossibleChange() {
   // If this change is caused by a paste clipboard action and all text is
   // selected, then call model_->on_paste_replacing_all() to prevent inline
   // autocomplete.
   if (paste_clipboard_requested_) {
     paste_clipboard_requested_ = false;
     if (IsSelectAll())
@@ skipping 712 matching lines @@
     const std::string& selected_text) {
   GtkClipboard* clipboard =
       gtk_widget_get_clipboard(text_view_, GDK_SELECTION_PRIMARY);
   DCHECK(clipboard);
   if (!clipboard)
     return;
 
   gtk_clipboard_set_text(
       clipboard, selected_text.data(), selected_text.size());
 }
+
+void AutocompleteEditViewGtk::SetTextAndSelectedRange(const std::wstring& text,
+                                                      const CharRange& range) {
+  std::string utf8 = WideToUTF8(text);
+  gtk_text_buffer_set_text(text_buffer_, utf8.data(), utf8.length());
+  SetSelectedRange(range);
+}
+
+void AutocompleteEditViewGtk::SetSelectedRange(const CharRange& range) {
+  GtkTextIter insert, bound;
+  ItersFromCharRange(range, &bound, &insert);
+  gtk_text_buffer_select_range(text_buffer_, &insert, &bound);
+}