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

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

Issue 2410303005: views: change Harmony unfocused border color to 000 @ 0.2a (Closed)
Patch Set: 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 | « no previous file | no next file » | 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/common_theme.h" 5 #include "ui/native_theme/common_theme.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "third_party/skia/include/core/SkCanvas.h" 9 #include "third_party/skia/include/core/SkCanvas.h"
10 #include "ui/base/material_design/material_design_controller.h" 10 #include "ui/base/material_design/material_design_controller.h"
(...skipping 18 matching lines...) Expand all
29 // Labels 29 // Labels
30 case NativeTheme::kColorId_LabelEnabledColor: 30 case NativeTheme::kColorId_LabelEnabledColor:
31 return kPrimaryTextColor; 31 return kPrimaryTextColor;
32 case NativeTheme::kColorId_LabelDisabledColor: 32 case NativeTheme::kColorId_LabelDisabledColor:
33 return SkColorSetA( 33 return SkColorSetA(
34 base_theme->GetSystemColor(NativeTheme::kColorId_LabelEnabledColor), 34 base_theme->GetSystemColor(NativeTheme::kColorId_LabelEnabledColor),
35 gfx::kDisabledControlAlpha); 35 gfx::kDisabledControlAlpha);
36 36
37 // FocusableBorder 37 // FocusableBorder
38 case NativeTheme::kColorId_UnfocusedBorderColor: 38 case NativeTheme::kColorId_UnfocusedBorderColor:
39 return SkColorSetA(SK_ColorBLACK, 0x24); 39 return SkColorSetA(SK_ColorBLACK, 0x33);
40 40
41 // Textfields 41 // Textfields
42 case NativeTheme::kColorId_TextfieldDefaultColor: 42 case NativeTheme::kColorId_TextfieldDefaultColor:
43 return kPrimaryTextColor; 43 return kPrimaryTextColor;
44 case NativeTheme::kColorId_TextfieldDefaultBackground: 44 case NativeTheme::kColorId_TextfieldDefaultBackground:
45 return base_theme->GetSystemColor( 45 return base_theme->GetSystemColor(
46 NativeTheme::kColorId_DialogBackground); 46 NativeTheme::kColorId_DialogBackground);
47 case NativeTheme::kColorId_TextfieldReadOnlyColor: 47 case NativeTheme::kColorId_TextfieldReadOnlyColor:
48 return SkColorSetA(base_theme->GetSystemColor( 48 return SkColorSetA(base_theme->GetSystemColor(
49 NativeTheme::kColorId_TextfieldDefaultColor), 49 NativeTheme::kColorId_TextfieldDefaultColor),
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 } 336 }
337 if (menu_item.corner_radius > 0) { 337 if (menu_item.corner_radius > 0) {
338 const SkScalar radius = SkIntToScalar(menu_item.corner_radius); 338 const SkScalar radius = SkIntToScalar(menu_item.corner_radius);
339 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint); 339 canvas->drawRoundRect(gfx::RectToSkRect(rect), radius, radius, paint);
340 return; 340 return;
341 } 341 }
342 canvas->drawRect(gfx::RectToSkRect(rect), paint); 342 canvas->drawRect(gfx::RectToSkRect(rect), paint);
343 } 343 }
344 344
345 } // namespace ui 345 } // namespace ui
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698