diff options
author | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 16:17:29 +0000 |
---|---|---|
committer | rohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 16:17:29 +0000 |
commit | 8c671be3c081932add13148f0437901b729bcff5 (patch) | |
tree | 9101fe86c10981bff462cce0e3faccdff715a84c /chrome/browser | |
parent | 0db0f43ddc6f6a9fea677b7dfa481cc1668f5320 (diff) | |
download | chromium_src-8c671be3c081932add13148f0437901b729bcff5.zip chromium_src-8c671be3c081932add13148f0437901b729bcff5.tar.gz chromium_src-8c671be3c081932add13148f0437901b729bcff5.tar.bz2 |
Removes two unused methods:
InstantLoader::DestroyPreviewContents()
AutocompleteEditView::GetMaxYCoordinate()
BUG=None
TEST=Everything should still compile.
Review URL: http://codereview.chromium.org/3772008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63218 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
9 files changed, 0 insertions, 42 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view.h b/chrome/browser/autocomplete/autocomplete_popup_view.h index 71f6c8d..64faa2f 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view.h @@ -50,9 +50,6 @@ class AutocompletePopupView { // Returns the popup's model. virtual AutocompletePopupModel* GetModel() = 0; - - // Returns the max y coordinate of the popup in screen coordinates. - virtual int GetMaxYCoordinate() = 0; }; #endif // CHROME_BROWSER_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_VIEW_H_ diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 056b847..aaf7e05 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -356,7 +356,6 @@ void AutocompletePopupViewGtk::UpdatePopupAppearance() { } gfx::Rect AutocompletePopupViewGtk::GetTargetBounds() { - NOTIMPLEMENTED(); return gfx::Rect(); } @@ -374,12 +373,6 @@ AutocompletePopupModel* AutocompletePopupViewGtk::GetModel() { return model_.get(); } -int AutocompletePopupViewGtk::GetMaxYCoordinate() { - // TODO: implement if match preview pans out. - NOTIMPLEMENTED(); - return 0; -} - void AutocompletePopupViewGtk::Observe(NotificationType type, const NotificationSource& source, const NotificationDetails& details) { diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h index 7684c37..89bd697 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.h @@ -41,7 +41,6 @@ class AutocompletePopupViewGtk : public AutocompletePopupView, virtual void PaintUpdatesNow(); virtual void OnDragCanceled(); virtual AutocompletePopupModel* GetModel(); - virtual int GetMaxYCoordinate(); // Overridden from NotificationObserver: virtual void Observe(NotificationType type, diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h index 885522b..70a1ba4 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.h +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.h @@ -76,8 +76,6 @@ class AutocompletePopupViewMac : public AutocompletePopupView { // Returns the popup's model. virtual AutocompletePopupModel* GetModel(); - virtual int GetMaxYCoordinate(); - // Opens the URL corresponding to the given |row|. If |force_background| is // true, forces the URL to open in a background tab. Otherwise, determines // the proper window open disposition from the modifier flags on |[NSApp diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm index 1f255a8..56b1854 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm @@ -485,12 +485,6 @@ AutocompletePopupModel* AutocompletePopupViewMac::GetModel() { return model_.get(); } -int AutocompletePopupViewMac::GetMaxYCoordinate() { - // TODO: implement if match preview pans out. - NOTIMPLEMENTED(); - return 0; -} - void AutocompletePopupViewMac::OpenURLForRow(int row, bool force_background) { DCHECK_GE(row, 0); diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index b7d6554..3c561b3 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -606,15 +606,6 @@ void InstantLoader::SetOmniboxBounds(const gfx::Rect& bounds) { } } -void InstantLoader::DestroyPreviewContents() { - if (!preview_contents_.get()) { - // We're not showing anything, nothing to do. - return; - } - - delete ReleasePreviewContents(INSTANT_COMMIT_DESTROY); -} - bool InstantLoader::IsMouseDownFromActivate() { return preview_tab_contents_delegate_->is_mouse_down_from_activate(); } diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/instant/instant_loader.h index 15746e5..3802bf8 100644 --- a/chrome/browser/instant/instant_loader.h +++ b/chrome/browser/instant/instant_loader.h @@ -50,10 +50,6 @@ class InstantLoader { // when showing results for a search provider that supports instant. void SetOmniboxBounds(const gfx::Rect& bounds); - // Destroys the preview TabContents. Does nothing if the preview TabContents - // has not been created. - void DestroyPreviewContents(); - // Returns true if the mouse is down as the result of activating the preview // content. bool IsMouseDownFromActivate(); diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 34ddcb5..d331ddd 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -849,15 +849,6 @@ AutocompletePopupModel* AutocompletePopupContentsView::GetModel() { return model_.get(); } -int AutocompletePopupContentsView::GetMaxYCoordinate() { - // Add one to kMaxMatches to account for the history shortcut that may be - // added. - return CalculateTargetBounds( - (static_cast<int>(AutocompleteResult::kMaxMatches) + 1) * - AutocompleteResultView::GetPreferredHeight( - result_font_, result_bold_font_)).bottom(); -} - //////////////////////////////////////////////////////////////////////////////// // AutocompletePopupContentsView, AutocompleteResultViewModel implementation: diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h index cf0640f..2924ce2 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h @@ -65,7 +65,6 @@ class AutocompletePopupContentsView : public views::View, virtual void PaintUpdatesNow(); virtual void OnDragCanceled(); virtual AutocompletePopupModel* GetModel(); - virtual int GetMaxYCoordinate(); // Overridden from AutocompleteResultViewModel: virtual bool IsSelectedIndex(size_t index) const; |