diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 22:43:53 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 22:43:53 +0000 |
commit | dec76e804867ced17b032571f440adf4945c4d99 (patch) | |
tree | fd798a848d7967b28d89350a55f48285057e2739 /chrome/browser/gtk | |
parent | 0695ef4d095a441148ae80a08576c25c2ab8bc40 (diff) | |
download | chromium_src-dec76e804867ced17b032571f440adf4945c4d99.zip chromium_src-dec76e804867ced17b032571f440adf4945c4d99.tar.gz chromium_src-dec76e804867ced17b032571f440adf4945c4d99.tar.bz2 |
FBTF: Move virtual methods to implementation files.
Remove logging.h and other headers where possible.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3461019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60369 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk')
-rw-r--r-- | chrome/browser/gtk/find_bar_gtk.cc | 8 | ||||
-rw-r--r-- | chrome/browser/gtk/find_bar_gtk.h | 8 | ||||
-rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.cc | 12 | ||||
-rw-r--r-- | chrome/browser/gtk/location_bar_view_gtk.h | 10 |
4 files changed, 25 insertions, 13 deletions
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc index 71c4081..47f9b0c 100644 --- a/chrome/browser/gtk/find_bar_gtk.cc +++ b/chrome/browser/gtk/find_bar_gtk.cc @@ -311,6 +311,14 @@ void FindBarGtk::InitWidgets() { gtk_widget_show(widget()); } +FindBarController* FindBarGtk::GetFindBarController() const { + return find_bar_controller_; +} + +void FindBarGtk::SetFindBarController(FindBarController* find_bar_controller) { + find_bar_controller_ = find_bar_controller; +} + void FindBarGtk::Show(bool animate) { if (animate) { slide_widget_->Open(); diff --git a/chrome/browser/gtk/find_bar_gtk.h b/chrome/browser/gtk/find_bar_gtk.h index 5e5873e..ee9c0e5 100644 --- a/chrome/browser/gtk/find_bar_gtk.h +++ b/chrome/browser/gtk/find_bar_gtk.h @@ -41,12 +41,8 @@ class FindBarGtk : public FindBar, GtkWidget* widget() const { return slide_widget_->widget(); } // Methods from FindBar. - virtual FindBarController* GetFindBarController() const { - return find_bar_controller_; - } - virtual void SetFindBarController(FindBarController* find_bar_controller) { - find_bar_controller_ = find_bar_controller; - } + virtual FindBarController* GetFindBarController() const; + virtual void SetFindBarController(FindBarController* find_bar_controller); virtual void Show(bool animate); virtual void Hide(bool animate); virtual void SetFocusAndSelection(); diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index 3d3cefd..8d68fa5 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -661,6 +661,18 @@ void LocationBarViewGtk::Revert() { location_entry_->RevertAll(); } +const AutocompleteEditView* LocationBarViewGtk::location_entry() const { + return location_entry_.get(); +} + +AutocompleteEditView* LocationBarViewGtk::location_entry() { + return location_entry_.get(); +} + +LocationBarTesting* LocationBarViewGtk::GetLocationBarForTesting() { + return this; +} + int LocationBarViewGtk::PageActionVisibleCount() { int count = 0; gtk_container_foreach(GTK_CONTAINER(page_action_hbox_.get()), diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h index 8c820d2..6ad62d1 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.h +++ b/chrome/browser/gtk/location_bar_view_gtk.h @@ -113,13 +113,9 @@ class LocationBarViewGtk : public AutocompleteEditController, virtual void InvalidatePageActions(); virtual void SaveStateToContents(TabContents* contents); virtual void Revert(); - virtual const AutocompleteEditView* location_entry() const { - return location_entry_.get(); - } - virtual AutocompleteEditView* location_entry() { - return location_entry_.get(); - } - virtual LocationBarTesting* GetLocationBarForTesting() { return this; } + virtual const AutocompleteEditView* location_entry() const; + virtual AutocompleteEditView* location_entry(); + virtual LocationBarTesting* GetLocationBarForTesting(); // Implement the LocationBarTesting interface. virtual int PageActionCount() { return page_action_views_.size(); } |