diff options
| author | Ben Murdoch <benm@google.com> | 2011-01-07 14:18:56 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-01-11 10:23:13 +0000 |
| commit | 201ade2fbba22bfb27ae029f4d23fca6ded109a0 (patch) | |
| tree | b793f4ed916f73cf18357ea467ff3deb5ffb5b52 /chrome/browser/gtk/location_bar_view_gtk.h | |
| parent | d8c4c37a7d0961944bfdfaa117d5c68c8e129c97 (diff) | |
| download | external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.zip external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.gz external_chromium-201ade2fbba22bfb27ae029f4d23fca6ded109a0.tar.bz2 | |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
Diffstat (limited to 'chrome/browser/gtk/location_bar_view_gtk.h')
| -rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h index 77e4134..bab0279 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.h +++ b/chrome/browser/gtk/location_bar_view_gtk.h @@ -96,6 +96,7 @@ class LocationBarViewGtk : public AutocompleteEditController, virtual void OnAutocompleteWillAccept(); // For this implementation, the parameter is ignored. virtual bool OnCommitSuggestedText(const std::wstring& typed_text); + virtual bool AcceptCurrentInstantPreview(); virtual void OnSetSuggestedSearchText(const string16& suggested_text); virtual void OnPopupBoundsChanged(const gfx::Rect& bounds); virtual void OnAutocompleteAccept(const GURL& url, @@ -156,7 +157,7 @@ class LocationBarViewGtk : public AutocompleteEditController, void set_profile(Profile* profile) { profile_ = profile; } bool IsVisible() { return GTK_WIDGET_VISIBLE(widget()); } - void UpdateFromTabContents(const TabContents* tab_contents); + void UpdateFromTabContents(TabContents* tab_contents); private: CHROMEGTK_CALLBACK_1(ContentSettingImageViewGtk, gboolean, OnButtonPressed, |