OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/panels/panel_scroller.h" | 5 #include "chrome/browser/chromeos/panels/panel_scroller.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/stl_util-inl.h" | 9 #include "base/stl_util-inl.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 AddChildView(panels_[3]->header); | 73 AddChildView(panels_[3]->header); |
74 AddChildView(panels_[4]->header); | 74 AddChildView(panels_[4]->header); |
75 } | 75 } |
76 | 76 |
77 PanelScroller::~PanelScroller() { | 77 PanelScroller::~PanelScroller() { |
78 STLDeleteContainerPointers(panels_.begin(), panels_.end()); | 78 STLDeleteContainerPointers(panels_.begin(), panels_.end()); |
79 } | 79 } |
80 | 80 |
81 // static | 81 // static |
82 PanelScroller* PanelScroller::CreateWindow() { | 82 PanelScroller* PanelScroller::CreateWindow() { |
83 views::Widget* widget = views::Widget::CreateWidget(); | 83 views::Widget* widget = new views::Widget; |
84 views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW); | 84 views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW); |
85 params.bounds = gfx::Rect(0, 0, 100, 800); | 85 params.bounds = gfx::Rect(0, 0, 100, 800); |
86 widget->Init(params); | 86 widget->Init(params); |
87 | 87 |
88 PanelScroller* scroller = new PanelScroller(); | 88 PanelScroller* scroller = new PanelScroller(); |
89 widget->SetContentsView(scroller); | 89 widget->SetContentsView(scroller); |
90 | 90 |
91 widget->Show(); | 91 widget->Show(); |
92 | 92 |
93 return scroller; | 93 return scroller; |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
236 } | 236 } |
237 | 237 |
238 void PanelScroller::AnimationProgressed(const ui::Animation* animation) { | 238 void PanelScroller::AnimationProgressed(const ui::Animation* animation) { |
239 scroll_pos_ = static_cast<int>( | 239 scroll_pos_ = static_cast<int>( |
240 static_cast<double>(animated_scroll_end_ - animated_scroll_begin_) * | 240 static_cast<double>(animated_scroll_end_ - animated_scroll_begin_) * |
241 animation_.GetCurrentValue()) + animated_scroll_begin_; | 241 animation_.GetCurrentValue()) + animated_scroll_begin_; |
242 | 242 |
243 Layout(); | 243 Layout(); |
244 SchedulePaint(); | 244 SchedulePaint(); |
245 } | 245 } |
OLD | NEW |