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

Side by Side Diff: views/controls/scrollbar/base_scroll_bar.cc

Issue 8598031: views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: reland for real Created 9 years, 1 month 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
« no previous file with comments | « views/controls/scroll_view.cc ('k') | views/controls/scrollbar/bitmap_scroll_bar.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "views/controls/scrollbar/base_scroll_bar.h" 5 #include "views/controls/scrollbar/base_scroll_bar.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/string16.h" 12 #include "base/string16.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "build/build_config.h" 14 #include "build/build_config.h"
15 #include "grit/ui_strings.h" 15 #include "grit/ui_strings.h"
16 #include "ui/base/keycodes/keyboard_codes.h" 16 #include "ui/base/keycodes/keyboard_codes.h"
17 #include "ui/base/l10n/l10n_util.h" 17 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/gfx/canvas.h" 18 #include "ui/gfx/canvas.h"
19 #include "ui/views/widget/widget.h"
19 #include "views/controls/menu/menu_item_view.h" 20 #include "views/controls/menu/menu_item_view.h"
20 #include "views/controls/menu/menu_runner.h" 21 #include "views/controls/menu/menu_runner.h"
21 #include "views/controls/scroll_view.h" 22 #include "views/controls/scroll_view.h"
22 #include "views/controls/scrollbar/base_scroll_bar_thumb.h" 23 #include "views/controls/scrollbar/base_scroll_bar_thumb.h"
23 #include "views/widget/widget.h"
24 24
25 #if defined(OS_LINUX) 25 #if defined(OS_LINUX)
26 #include "ui/gfx/screen.h" 26 #include "ui/gfx/screen.h"
27 #endif 27 #endif
28 28
29 #undef min 29 #undef min
30 #undef max 30 #undef max
31 31
32 namespace views { 32 namespace views {
33 33
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 thumb_position = thumb_position - (thumb_->GetSize() / 2); 384 thumb_position = thumb_position - (thumb_->GetSize() / 2);
385 return (thumb_position * contents_size_) / GetTrackSize(); 385 return (thumb_position * contents_size_) / GetTrackSize();
386 } 386 }
387 387
388 void BaseScrollBar::SetThumbTrackState(CustomButton::ButtonState state) { 388 void BaseScrollBar::SetThumbTrackState(CustomButton::ButtonState state) {
389 thumb_track_state_ = state; 389 thumb_track_state_ = state;
390 SchedulePaint(); 390 SchedulePaint();
391 } 391 }
392 392
393 } // namespace views 393 } // namespace views
OLDNEW
« no previous file with comments | « views/controls/scroll_view.cc ('k') | views/controls/scrollbar/bitmap_scroll_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698