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

Side by Side Diff: ui/views/controls/scrollbar/kennedy_scroll_bar.cc

Issue 1543173002: Switch to standard integer types in ui/views/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/views/controls/scrollbar/kennedy_scroll_bar.h" 5 #include "ui/views/controls/scrollbar/kennedy_scroll_bar.h"
6 6
7 #include "base/macros.h"
7 #include "third_party/skia/include/core/SkColor.h" 8 #include "third_party/skia/include/core/SkColor.h"
8 #include "third_party/skia/include/core/SkXfermode.h" 9 #include "third_party/skia/include/core/SkXfermode.h"
9 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
10 #include "ui/views/background.h" 11 #include "ui/views/background.h"
11 #include "ui/views/border.h" 12 #include "ui/views/border.h"
12 #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h" 13 #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h"
13 14
14 namespace views { 15 namespace views {
15 namespace { 16 namespace {
16 17
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 CustomButton::ButtonState state = GetThumbTrackState(); 99 CustomButton::ButtonState state = GetThumbTrackState();
99 if ((state == CustomButton::STATE_HOVERED) || 100 if ((state == CustomButton::STATE_HOVERED) ||
100 (state == CustomButton::STATE_PRESSED)) { 101 (state == CustomButton::STATE_PRESSED)) {
101 gfx::Rect local_bounds(GetLocalBounds()); 102 gfx::Rect local_bounds(GetLocalBounds());
102 canvas->FillRect(local_bounds, kTrackHoverColor); 103 canvas->FillRect(local_bounds, kTrackHoverColor);
103 canvas->DrawRect(local_bounds, kBorderColor); 104 canvas->DrawRect(local_bounds, kBorderColor);
104 } 105 }
105 } 106 }
106 107
107 } // namespace views 108 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698