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

Side by Side Diff: ui/native_theme/native_theme_base.cc

Issue 2421913002: Change Aura overlay scrollbars from solid color to painted scrollbars. (Closed)
Patch Set: Rebase Created 4 years, 2 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
« no previous file with comments | « ui/native_theme/native_theme_base.h ('k') | ui/native_theme/overlay_scrollbar_constants_aura.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/native_theme/native_theme_base.h" 5 #include "ui/native_theme/native_theme_base.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 SkColorSetRGB(0x9d, 0x96, 0x8e); 44 SkColorSetRGB(0x9d, 0x96, 0x8e);
45 45
46 const SkColor kTextBorderColor = SkColorSetRGB(0xa9, 0xa9, 0xa9); 46 const SkColor kTextBorderColor = SkColorSetRGB(0xa9, 0xa9, 0xa9);
47 47
48 const SkColor kProgressBorderColor = kTextBorderColor; 48 const SkColor kProgressBorderColor = kTextBorderColor;
49 const SkColor kProgressTickColor = SkColorSetRGB(0xED, 0xED, 0xED); 49 const SkColor kProgressTickColor = SkColorSetRGB(0xED, 0xED, 0xED);
50 const SkColor kProgressValueColor = gfx::kGoogleBlue300; 50 const SkColor kProgressValueColor = gfx::kGoogleBlue300;
51 51
52 const SkColor kMenuPopupBackgroundColor = SkColorSetRGB(210, 225, 246); 52 const SkColor kMenuPopupBackgroundColor = SkColorSetRGB(210, 225, 246);
53 53
54 const unsigned int kDefaultScrollbarWidth = 15; 54 const int kDefaultScrollbarWidth = 15;
55 const unsigned int kDefaultScrollbarButtonLength = 14; 55 const int kDefaultScrollbarButtonLength = 14;
56 56
57 const SkColor kCheckboxTinyColor = SK_ColorGRAY; 57 const SkColor kCheckboxTinyColor = SK_ColorGRAY;
58 const SkColor kCheckboxShadowColor = SkColorSetARGB(0x15, 0, 0, 0); 58 const SkColor kCheckboxShadowColor = SkColorSetARGB(0x15, 0, 0, 0);
59 const SkColor kCheckboxShadowHoveredColor = SkColorSetARGB(0x1F, 0, 0, 0); 59 const SkColor kCheckboxShadowHoveredColor = SkColorSetARGB(0x1F, 0, 0, 0);
60 const SkColor kCheckboxShadowDisabledColor = SkColorSetARGB(0, 0, 0, 0); 60 const SkColor kCheckboxShadowDisabledColor = SkColorSetARGB(0, 0, 0, 0);
61 const SkColor kCheckboxGradientColors[] = { 61 const SkColor kCheckboxGradientColors[] = {
62 SkColorSetRGB(0xed, 0xed, 0xed), 62 SkColorSetRGB(0xed, 0xed, 0xed),
63 SkColorSetRGB(0xde, 0xde, 0xde) }; 63 SkColorSetRGB(0xde, 0xde, 0xde) };
64 const SkColor kCheckboxGradientPressedColors[] = { 64 const SkColor kCheckboxGradientPressedColors[] = {
65 SkColorSetRGB(0xe7, 0xe7, 0xe7), 65 SkColorSetRGB(0xe7, 0xe7, 0xe7),
(...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f); 1015 SkScalar min_diff = Clamp((hsv1[1] + hsv2[1]) * 1.2f, 0.28f, 0.5f);
1016 SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f); 1016 SkScalar diff = Clamp(fabs(hsv1[2] - hsv2[2]) / 2, min_diff, 0.5f);
1017 1017
1018 if (hsv1[2] + hsv2[2] > 1.0) 1018 if (hsv1[2] + hsv2[2] > 1.0)
1019 diff = -diff; 1019 diff = -diff;
1020 1020
1021 return SaturateAndBrighten(hsv2, -0.2f, diff); 1021 return SaturateAndBrighten(hsv2, -0.2f, diff);
1022 } 1022 }
1023 1023
1024 } // namespace ui 1024 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_base.h ('k') | ui/native_theme/overlay_scrollbar_constants_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698