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

Unified Diff: chrome/browser/chromeos/panels/panel_scroller.cc

Issue 6685069: Disambiguate OnMouseCaptureLost from OnMouseReleased, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address most TODOs and sync. Created 9 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
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();

Powered by Google App Engine
This is Rietveld 408576698