Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5342)

Unified Diff: chrome/browser/gtk/browser_toolbar_gtk.h

Issue 40013: Implement a GTK LocationBarView and Autocomplete. (Closed)
Patch Set: Feedback Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser.scons ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/browser_toolbar_gtk.h
diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h
index c943db472e6077df5e7a1e1d3add3f137071ec31..9e854fdcec7bb4c5f8517ef2229b87bbbfbc4096 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_;
« no previous file with comments | « chrome/browser/browser.scons ('k') | chrome/browser/gtk/browser_toolbar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698