Implement a GTK LocationBarView and Autocomplete{Edit,Popup}View.

This implements some beginning functionality of "omnibox".  It uses GtkTextView for a rich text edit for the location bar.  Color emphasis, inline autocomplete, and the results popup work.  You can select one of the omnibox results using the keyboard.  Mouse selection doesn't work.  The results popup code will have to be scraped and reimplemented with cairo / pango.

BUG=8236

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


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

1 files changed, 3 insertions, 21 deletions

diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h
index c943db4..9e854fd 100644
--- a/chrome/browser/gtk/browser_toolbar_gtk.h
+++ b/chrome/browser/gtk/browser_toolbar_gtk.h
@@ -19,6 +19,7 @@ class Browser;
 class CustomContainerButton;
 class CustomDrawButton;
 class LocationBar;
+class LocationBarViewGtk;
 class Profile;
 class TabContents;
 class ToolbarModel;
@@ -83,25 +84,6 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
       unsigned int accelerator,
       unsigned int accelerator_mod);
 
-  // Gtk callback for the "activate" signal on the |entry_| widget. Responds to
-  // enter.
-  static void OnEntryActivate(GtkEntry *entry, BrowserToolbarGtk* toolbar);
-
-  // Gtk callback for the "focus" signal on the |entry_| widget.
-  static gboolean OnEntryFocus(GtkWidget* widget,
-                               GtkDirectionType direction,
-                               BrowserToolbarGtk* host);
-
-  // Gtk callback for the "focus-in" signal on the |entry_| widget.
-  static gboolean OnEntryFocusIn(GtkWidget* widget,
-                                 GdkEventFocus* focus,
-                                 BrowserToolbarGtk* host);
-
-  // Gtk callback for the "focus-out" signal on the |entry_| widget.
-  static gboolean OnEntryFocusOut(GtkWidget* widget,
-                                  GdkEventFocus* focus,
-                                  BrowserToolbarGtk* host);
-
   // Gtk callback for the "clicked" signal.
   static void OnButtonClick(GtkWidget* button, BrowserToolbarGtk* toolbar);
 
@@ -126,8 +108,8 @@ class BrowserToolbarGtk : public CommandUpdater::CommandObserver,
   // Tooltip container for all GTK widgets in this class.
   GtkTooltips* toolbar_tooltips_;
 
-  // Our temporary URL bar (until we get the omnibox up).
-  GtkWidget* entry_;
+  // The location bar view.
+  scoped_ptr<LocationBarViewGtk> location_bar_;
 
   // A pointer to our window's accelerator list.
   GtkAccelGroup* accel_group_;