Index: chrome/browser/chromeos/panels/panel_scroller.cc |
diff --git a/chrome/browser/chromeos/panels/panel_scroller.cc b/chrome/browser/chromeos/panels/panel_scroller.cc |
index 93ba1633a31088803edf5a5c20e328ea2926a3bc..9aa4fc4d3b5ba2f9f025b55d4f9bdf9cd13a76b2 100644 |
--- a/chrome/browser/chromeos/panels/panel_scroller.cc |
+++ b/chrome/browser/chromeos/panels/panel_scroller.cc |
@@ -93,15 +93,6 @@ PanelScroller* PanelScroller::CreateWindow() { |
return scroller; |
} |
-void PanelScroller::ViewHierarchyChanged(bool is_add, |
- views::View* parent, |
- views::View* child) { |
- // Our child views changed without us knowing it. Stop the animation and mark |
- // us as dirty (needs_layout_ = true). |
- animation_.Stop(); |
- needs_layout_ = true; |
-} |
- |
gfx::Size PanelScroller::GetPreferredSize() { |
return gfx::Size(75, 200); |
} |
@@ -163,10 +154,6 @@ bool PanelScroller::OnMouseDragged(const views::MouseEvent& event) { |
return true; |
} |
-void PanelScroller::OnMouseReleased(const views::MouseEvent& event, |
- bool canceled) { |
-} |
- |
void PanelScroller::HeaderClicked(PanelScrollerHeader* source) { |
for (size_t i = 0; i < panels_.size(); i++) { |
if (panels_[i]->header == source) { |
@@ -177,6 +164,15 @@ void PanelScroller::HeaderClicked(PanelScrollerHeader* source) { |
NOTREACHED() << "Invalid panel passed to HeaderClicked."; |
} |
+void PanelScroller::ViewHierarchyChanged(bool is_add, |
+ views::View* parent, |
+ views::View* child) { |
+ // Our child views changed without us knowing it. Stop the animation and mark |
+ // us as dirty (needs_layout_ = true). |
+ animation_.Stop(); |
+ needs_layout_ = true; |
+} |
+ |
void PanelScroller::ScrollToPanel(int index) { |
int affected_panel_height = |
panels_[index]->container->GetPreferredSize().height(); |