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

Side by Side Diff: chrome/browser/chromeos/panels/panel_scroller.cc

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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"
11 #include "base/utf_string_conversions.h" 11 #include "base/utf_string_conversions.h"
12 #include "chrome/browser/chromeos/panels/panel_scroller_container.h" 12 #include "chrome/browser/chromeos/panels/panel_scroller_container.h"
13 #include "chrome/browser/chromeos/panels/panel_scroller_header.h" 13 #include "chrome/browser/chromeos/panels/panel_scroller_header.h"
14 #include "gfx/canvas.h" 14 #include "ui/gfx/canvas.h"
15 #include "views/widget/widget_gtk.h" 15 #include "views/widget/widget_gtk.h"
16 16
17 struct PanelScroller::Panel { 17 struct PanelScroller::Panel {
18 PanelScrollerHeader* header; 18 PanelScrollerHeader* header;
19 PanelScrollerContainer* container; 19 PanelScrollerContainer* container;
20 }; 20 };
21 21
22 PanelScroller::PanelScroller() 22 PanelScroller::PanelScroller()
23 : views::View(), 23 : views::View(),
24 divider_height_(18), 24 divider_height_(18),
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 } 239 }
240 240
241 void PanelScroller::AnimationProgressed(const ui::Animation* animation) { 241 void PanelScroller::AnimationProgressed(const ui::Animation* animation) {
242 scroll_pos_ = static_cast<int>( 242 scroll_pos_ = static_cast<int>(
243 static_cast<double>(animated_scroll_end_ - animated_scroll_begin_) * 243 static_cast<double>(animated_scroll_end_ - animated_scroll_begin_) *
244 animation_.GetCurrentValue()) + animated_scroll_begin_; 244 animation_.GetCurrentValue()) + animated_scroll_begin_;
245 245
246 Layout(); 246 Layout();
247 SchedulePaint(); 247 SchedulePaint();
248 } 248 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698