Make Linux restore Omnibox contents on tab switch.

chrome/browser/autocomplete/autocomplete_edit_view_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/autocomplete/autocomplete_edit_view.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/common/owned_widget_gtk.h"
 #include "chrome/common/page_transition_types.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditController;
 class AutocompleteEditModel;
 class AutocompletePopupPositioner;
 class AutocompletePopupViewGtk;
 class CommandUpdater;
 class Profile;
 class TabContents;
 
 class AutocompleteEditViewGtk : public AutocompleteEditView {
  public:
+  // Modeled like the Windows CHARRANGE.  Represent a pair of cursor position
+  // offsets.  Since GtkTextIters are invalid after the buffer is changed, we
+  // work in character offsets (not bytes).
+  struct CharRange {
+    CharRange() : cp_min(0), cp_max(0) { }
+    CharRange(int n, int x) : cp_min(n), cp_max(x) { }
+
+    // Work in integers to match the gint GTK APIs.
+    int cp_min;  // For a selection: Represents the start.
+    int cp_max;  // For a selection: Represents the end (insert position).
+  };
+
   AutocompleteEditViewGtk(AutocompleteEditController* controller,
                           ToolbarModel* toolbar_model,
                           Profile* profile,
                           CommandUpdater* command_updater,
                           AutocompletePopupPositioner* popup_positioner);
   ~AutocompleteEditViewGtk();
 
   // Initialize, create the underlying widgets, etc.
   void Init();
 
@@ skipping 40 matching lines @@
 
   virtual void OnTemporaryTextMaybeChanged(const std::wstring& display_text,
                                            bool save_original_selection);
   virtual bool OnInlineAutocompleteTextMaybeChanged(
       const std::wstring& display_text, size_t user_text_length);
   virtual void OnRevertTemporaryText();
   virtual void OnBeforePossibleChange();
   virtual bool OnAfterPossibleChange();
 
  private:
-  // Modeled like the Windows CHARRANGE.  Represent a pair of cursor position
-  // offsets.  Since GtkTextIters are invalid after the buffer is changed, we
-  // work in character offsets (not bytes).
-  struct CharRange {
-    CharRange() : cp_min(0), cp_max(0) { }
-    CharRange(int n, int x) : cp_min(n), cp_max(x) { }
-
-    // Work in integers to match the gint GTK APIs.
-    int cp_min;  // For a selection: Represents the start.
-    int cp_max;  // For a selection: Represents the end (insert position).
-  };
-
   // TODO(deanm): Would be nice to insulate the thunkers better, etc.
   static void HandleBeginUserActionThunk(GtkTextBuffer* unused, gpointer self) {
     reinterpret_cast<AutocompleteEditViewGtk*>(self)->HandleBeginUserAction();
   }
   void HandleBeginUserAction();
 
   static void HandleEndUserActionThunk(GtkTextBuffer* unused, gpointer self) {
     reinterpret_cast<AutocompleteEditViewGtk*>(self)->HandleEndUserAction();
   }
   void HandleEndUserAction();
@@ skipping 83 matching lines @@
                                                 const gchar* text,
                                                 gpointer self) {
     // If there is nothing to paste (|text| is NULL), do nothing.
     if (!text)
       return;
     reinterpret_cast<AutocompleteEditViewGtk*>(self)->
         HandlePasteAndGoReceivedText(UTF8ToWide(text));
   }
   void HandlePasteAndGoReceivedText(const std::wstring& text);
 
+  static void HandleMarkSetThunk(GtkTextBuffer* buffer,
+                                 GtkTextIter* location,
+                                 GtkTextMark* mark,
+                                 gpointer self) {
+    reinterpret_cast<AutocompleteEditViewGtk*>(self)->
+        HandleMarkSet(buffer, location, mark);
+  }
+  void HandleMarkSet(GtkTextBuffer* buffer,
+                     GtkTextIter* location,
+                     GtkTextMark* mark);
+
   // Get the character indices of the current selection.  This honors
   // direction, cp_max is the insertion point, and cp_min is the bound.
   CharRange GetSelection();
 
   // Translate from character positions to iterators for the current buffer.
   void ItersFromCharRange(const CharRange& range,
                           GtkTextIter* iter_min,
                           GtkTextIter* iter_max);
 
   // Return the number of characers in the current buffer.
   int GetTextLength();
 
   // Try to parse the current text as a URL and colorize the components.
   void EmphasizeURLComponents();
 
   // Internally invoked whenever the text changes in some way.
   void TextChanged();
 
+  // Save 'selected_text' as the PRIMARY X selection.
+  void SavePrimarySelection(const std::string& selected_text);
+
   // The widget we expose, used for vertically centering the real text edit,
   // since the height will change based on the font / font size, etc.
   OwnedWidgetGtk alignment_;
 
   // The actual text entry which will be owned by the alignment_.
   GtkWidget* text_view_;
 
   GtkTextTagTable* tag_table_;
   GtkTextBuffer* text_buffer_;
   GtkTextTag* base_tag_;
   GtkTextTag* secure_scheme_tag_;
   GtkTextTag* insecure_scheme_tag_;
   GtkTextTag* black_text_tag_;
 
-  // The primary selection clipboard for our text view widget.  This is used
-  // for working around some clipboard manager (klipper / glipper) bugs by
-  // removing and adding back the clipboard around inline autocomplete.
-  GtkClipboard* primary_clipboard_;
-
   scoped_ptr<AutocompleteEditModel> model_;
   scoped_ptr<AutocompletePopupViewGtk> popup_view_;
   AutocompleteEditController* controller_;
   ToolbarModel* toolbar_model_;
 
   // The object that handles additional command functionality exposed on the
   // edit, such as invoking the keyword editor.
   CommandUpdater* command_updater_;
 
   // When true, the location bar view is read only and also is has a slightly
   // different presentation (font size / color). This is used for popups.
   // TODO(deanm).
   bool popup_window_mode_;
 
   ToolbarModel::SecurityLevel scheme_security_level_;
 
   // Tracking state before and after a possible change.
   std::wstring text_before_change_;
   CharRange sel_before_change_;
 
+  // The most-recently-selected text from the entry.  This is updated on-the-fly
+  // as the user selects text.  It is used in cases where we need to make the
+  // PRIMARY selection persist even after the user has unhighlighted the text in
+  // the view (e.g. when they highlight some text and then click to unhighlight
+  // it, we pass this string to SavePrimarySelection()).
+  std::string selected_text_;
+
+  // Has the current value of 'selected_text_' been saved as the PRIMARY
+  // selection?
+  bool selection_saved_;
+
   DISALLOW_COPY_AND_ASSIGN(AutocompleteEditViewGtk);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_EDIT_VIEW_GTK_H_