Landing http://codereview.chromium.org/3387008 for sadrul:

linux: Add support for undo in the omnibox.

GtkTextView does not support undo. So borrow the relevant code from
GtkSourceView.

BUG=18210
TEST=None

Patch from sadrul <sadrul@chromium.org>

Review URL: http://codereview.chromium.org/3429025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60744 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -282,6 +282,7 @@ include_rules = [
   "+build",
   "+ipc",
   "+rlz",
+  "+third_party/undoview",
 
   # For now, we allow ICU to be included by specifying "unicode/...", although
   # this should probably change.

chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc

@@ -32,6 +32,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
+#include "third_party/undoview/undo_view.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h"
@@ -216,7 +217,7 @@ void AutocompleteEditViewGtk::Init() {
   tag_table_ = gtk_text_tag_table_new();
   text_buffer_ = gtk_text_buffer_new(tag_table_);
   g_object_set_data(G_OBJECT(text_buffer_), kAutocompleteEditViewGtkKey, this);
-  text_view_ = gtk_text_view_new_with_buffer(text_buffer_);
+  text_view_ = gtk_undo_view_new(text_buffer_);
   if (popup_window_mode_)
     gtk_text_view_set_editable(GTK_TEXT_VIEW(text_view_), false);
 

chrome/chrome_browser.gypi

@@ -3234,6 +3234,7 @@
             '../build/linux/system.gyp:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:nss',
+            '../third_party/undoview/undoview.gyp:undoview',
           ],
           'link_settings': {
             'libraries': [

third_party/undoview/LICENSE

+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

third_party/undoview/README.chromium

+Name: undoview
+URL: http://projects.gnome.org/gtksourceview/
+
+This contains GtkUndoView, which is GtkTextView with undo/redo
+support. The code to add the support is borrowed from GtkSourceView.
+However since SV has a lot of other stuff we don't want, we borrow
+only the undo support and add it to GtkTextView to create a
+GtkUndoView.
+

third_party/undoview/undo_manager.h

+/*
+ * Copyright (C) 1998, 1999 Alex Roberts, Evan Lawrence
+ * Copyright (C) 2000, 2001 Chema Celorio, Paolo Maggi
+ * Copyright (C) 2002, 2003 Paolo Maggi
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef CHROME_BROWSER_AUTOCOMPLETE_UNDO_MANAGER_H_
+#define CHROME_BROWSER_AUTOCOMPLETE_UNDO_MANAGER_H_
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GTK_SOURCE_TYPE_UNDO_MANAGER            (gtk_source_undo_manager_get_type())
+
+#define GTK_SOURCE_UNDO_MANAGER(obj)            \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManager))
+
+#define GTK_SOURCE_UNDO_MANAGER_CLASS(klass)    \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
+
+#define GTK_SOURCE_IS_UNDO_MANAGER(obj)         \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_SOURCE_TYPE_UNDO_MANAGER))
+
+#define GTK_SOURCE_IS_UNDO_MANAGER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_SOURCE_TYPE_UNDO_MANAGER))
+
+#define GTK_SOURCE_UNDO_MANAGER_GET_CLASS(obj)  \
+  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_SOURCE_TYPE_UNDO_MANAGER, GtkSourceUndoManagerClass))
+
+typedef struct _GtkSourceUndoManager          GtkSourceUndoManager;
+typedef struct _GtkSourceUndoManagerClass   GtkSourceUndoManagerClass;
+
+typedef struct _GtkSourceUndoManagerPrivate   GtkSourceUndoManagerPrivate;
+
+struct _GtkSourceUndoManager
+{
+  GObject base;
+
+  GtkSourceUndoManagerPrivate *priv;
+};
+
+struct _GtkSourceUndoManagerClass
+{
+  GObjectClass parent_class;
+
+  /* Signals */
+  void (*can_undo)(GtkSourceUndoManager *um, gboolean can_undo);
+  void (*can_redo)(GtkSourceUndoManager *um, gboolean can_redo);
+};
+
+GType            gtk_source_undo_manager_get_type(void) G_GNUC_CONST;
+
+GtkSourceUndoManager*   gtk_source_undo_manager_new(GtkTextBuffer     *buffer);
+
+gboolean    gtk_source_undo_manager_can_undo(const GtkSourceUndoManager *um);
+gboolean    gtk_source_undo_manager_can_redo(const GtkSourceUndoManager *um);
+
+void      gtk_source_undo_manager_undo(GtkSourceUndoManager   *um);
+void      gtk_source_undo_manager_redo(GtkSourceUndoManager   *um);
+
+void      gtk_source_undo_manager_begin_not_undoable_action(GtkSourceUndoManager  *um);
+void      gtk_source_undo_manager_end_not_undoable_action(GtkSourceUndoManager  *um);
+
+gint      gtk_source_undo_manager_get_max_undo_levels(GtkSourceUndoManager   *um);
+void      gtk_source_undo_manager_set_max_undo_levels(GtkSourceUndoManager   *um,
+                        gint        undo_levels);
+
+G_END_DECLS
+
+#endif  // CHROME_BROWSER_AUTOCOMPLETE_UNDO_MANAGER_H_
+

third_party/undoview/undo_view.c

+// Copyright (c) 2010 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.
+
+// Boilerplate code was generated by http://burtonini.com/cgi/gobject.py
+
+#include <gdk/gdkkeysyms.h>
+
+#include "undo_view.h"
+
+G_DEFINE_TYPE (GtkUndoView, gtk_undo_view, GTK_TYPE_TEXT_VIEW)
+
+static void
+gtk_undo_view_dispose(GObject *object) {
+  GtkUndoView *uview = GTK_UNDO_VIEW(object);
+
+  if(uview->undo_manager_) {
+    g_object_unref(G_OBJECT(uview->undo_manager_));
+    uview->undo_manager_ = NULL;
+  }
+  G_OBJECT_CLASS(gtk_undo_view_parent_class)->dispose(object);
+}
+
+static void
+gtk_undo_view_undo(GtkUndoView *uview) {
+  if(gtk_source_undo_manager_can_undo(uview->undo_manager_))
+    gtk_source_undo_manager_undo(uview->undo_manager_);
+}
+
+static void
+gtk_undo_view_redo(GtkUndoView *uview) {
+  if(gtk_source_undo_manager_can_redo(uview->undo_manager_))
+    gtk_source_undo_manager_redo(uview->undo_manager_);
+}
+
+static void
+gtk_undo_view_class_init(GtkUndoViewClass *klass) {
+  GObjectClass *object_class = G_OBJECT_CLASS(klass);
+  GtkBindingSet *binding_set;
+
+  g_signal_new("undo",
+      G_TYPE_FROM_CLASS(klass),
+      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+      G_STRUCT_OFFSET(GtkUndoViewClass, undo),
+      NULL,
+      NULL,
+      g_cclosure_marshal_VOID__VOID,
+      G_TYPE_NONE,
+      0);
+  g_signal_new("redo",
+      G_TYPE_FROM_CLASS(klass),
+      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+      G_STRUCT_OFFSET(GtkUndoViewClass, redo),
+      NULL,
+      NULL,
+      g_cclosure_marshal_VOID__VOID,
+      G_TYPE_NONE,
+      0);
+
+  klass->undo = gtk_undo_view_undo;
+  klass->redo = gtk_undo_view_redo;
+
+  binding_set = gtk_binding_set_by_class(klass);
+  gtk_binding_entry_add_signal(binding_set, GDK_z, GDK_CONTROL_MASK, "undo", 0);
+  gtk_binding_entry_add_signal(binding_set, GDK_y, GDK_CONTROL_MASK, "redo", 0);
+  gtk_binding_entry_add_signal(binding_set, GDK_z, GDK_CONTROL_MASK | GDK_SHIFT_MASK, "redo", 0);
+  gtk_binding_entry_add_signal(binding_set, GDK_F14, 0, "undo", 0);
+
+  object_class->dispose = gtk_undo_view_dispose;
+}
+
+static void
+gtk_undo_view_init(GtkUndoView *self) {
+}
+
+GtkWidget*
+gtk_undo_view_new(GtkTextBuffer *buffer) {
+  GtkWidget *ret = g_object_new(GTK_TYPE_UNDO_VIEW, "buffer", buffer, NULL);
+  GTK_UNDO_VIEW(ret)->undo_manager_ = gtk_source_undo_manager_new(GTK_TEXT_BUFFER(buffer));
+
+  return ret;
+}
+

third_party/undoview/undo_view.h

+// Copyright (c) 2010 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.
+
+// Boilerplate code was generated by http://burtonini.com/cgi/gobject.py
+
+#ifndef CHROME_BROWSER_AUTOCOMPLETE_UNDO_VIEW_H_
+#define CHROME_BROWSER_AUTOCOMPLETE_UNDO_VIEW_H_
+
+#include <gtk/gtk.h>
+#include "undo_manager.h"
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_UNDO_VIEW gtk_undo_view_get_type()
+
+#define GTK_UNDO_VIEW(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_UNDO_VIEW, GtkUndoView))
+
+#define GTK_UNDO_VIEW_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_UNDO_VIEW, GtkUndoViewClass))
+
+#define GTK_IS_UNDO_VIEW(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_UNDO_VIEW))
+
+#define GTK_IS_UNDO_VIEW_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_UNDO_VIEW))
+
+#define GTK_UNDO_VIEW_GET_CLASS(obj) \
+  (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_UNDO_VIEW, GtkUndoViewClass))
+
+typedef struct {
+  GtkTextView parent;
+  GtkSourceUndoManager *undo_manager_;
+} GtkUndoView;
+
+typedef struct {
+  GtkTextViewClass parent_class;
+
+  void (*undo)(GtkUndoView *);
+  void (*redo)(GtkUndoView *);
+} GtkUndoViewClass;
+
+GType gtk_undo_view_get_type(void);
+
+GtkWidget* gtk_undo_view_new(GtkTextBuffer *buffer);
+
+G_END_DECLS
+
+#endif  // CHROME_BROWSER_AUTOCOMPLETE_UNDO_VIEW_H_
+

third_party/undoview/undoview.gyp

+# Copyright (c) 2010 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'undoview',
+      'type': '<(library)',
+      'sources': [
+        'undo_manager.h',
+        'undo_manager.c',
+        'undo_view.h',
+        'undo_view.c',
+      ],
+
+      'dependencies' : [
+        '../../build/linux/system.gyp:gtk',
+      ],
+    },
+  ],
+}