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

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

Issue 1438513003: [MD] Implement incognito colors as a NativeTheme (for Aura). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: init param, pkasting feedback Created 5 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
« no previous file with comments | « ui/native_theme/native_theme.gyp ('k') | ui/native_theme/native_theme_dark_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_aura.h" 5 #include "ui/native_theme/native_theme_aura.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "ui/base/layout.h" 10 #include "ui/base/layout.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // Shared colors. 102 // Shared colors.
103 static const SkColor kTextfieldDefaultBackground = SK_ColorWHITE; 103 static const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
104 static const SkColor kTextfieldSelectionBackgroundFocused = 104 static const SkColor kTextfieldSelectionBackgroundFocused =
105 SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB); 105 SkColorSetARGB(0x54, 0x60, 0xA8, 0xEB);
106 106
107 // MD colors. 107 // MD colors.
108 if (ui::MaterialDesignController::IsModeMaterial()) { 108 if (ui::MaterialDesignController::IsModeMaterial()) {
109 // Dialogs: 109 // Dialogs:
110 static const SkColor kDialogBackgroundColorMd = SK_ColorWHITE; 110 static const SkColor kDialogBackgroundColorMd = SK_ColorWHITE;
111 // Results tables: 111 // Results tables:
112 static const SkColor kResultsTableSelectedBackgroundMd =
113 SkColorSetARGB(0x15, 0x00, 0x00, 0x00);
114 static const SkColor kResultsTableTextMd = SK_ColorBLACK; 112 static const SkColor kResultsTableTextMd = SK_ColorBLACK;
115 static const SkColor kResultsTableDimmedTextMd = 113 static const SkColor kResultsTableDimmedTextMd =
116 SkColorSetRGB(0x64, 0x64, 0x64); 114 SkColorSetRGB(0x64, 0x64, 0x64);
117 static const SkColor kResultsTableUrlMd = SkColorSetRGB(0x33, 0x67, 0xD6);
118 static const SkColor kResultsTableHoveredBackgroundMd =
119 SkColorSetARGB(0x0D, 0x00, 0x00, 0x00);
120 static const SkColor kResultsTableDividerMd = color_utils::AlphaBlend( 115 static const SkColor kResultsTableDividerMd = color_utils::AlphaBlend(
121 kResultsTableTextMd, kTextfieldDefaultBackground, 0x34); 116 kResultsTableTextMd, kTextfieldDefaultBackground, 0x34);
122 static const SkColor kResultsTableSelectedDividerMd = 117 static const SkColor kResultsTableSelectedDividerMd =
123 color_utils::AlphaBlend(kResultsTableTextMd, 118 color_utils::AlphaBlend(kResultsTableTextMd,
124 kTextfieldSelectionBackgroundFocused, 0x34); 119 kTextfieldSelectionBackgroundFocused, 0x34);
125 static const SkColor kPositiveTextColorMd = SkColorSetRGB(0x0b, 0x80, 0x43); 120 static const SkColor kPositiveTextColorMd = SkColorSetRGB(0x0b, 0x80, 0x43);
126 static const SkColor kNegativeTextColorMd = SkColorSetRGB(0xc5, 0x39, 0x29); 121 static const SkColor kNegativeTextColorMd = SkColorSetRGB(0xc5, 0x39, 0x29);
127 122
128 switch (color_id) { 123 switch (color_id) {
129 // Dialogs 124 // Dialogs
130 case kColorId_DialogBackground: 125 case kColorId_DialogBackground:
131 case kColorId_BubbleBackground: 126 case kColorId_BubbleBackground:
132 return kDialogBackgroundColorMd; 127 return kDialogBackgroundColorMd;
133 128
134 // Results Tables 129 // Results Tables
135 case kColorId_ResultsTableHoveredBackground: 130 case kColorId_ResultsTableHoveredBackground:
136 return kResultsTableHoveredBackgroundMd; 131 return SkColorSetA(
132 GetSystemColor(kColorId_ResultsTableNormalBackground), 0x0D);
137 case kColorId_ResultsTableSelectedBackground: 133 case kColorId_ResultsTableSelectedBackground:
138 return kResultsTableSelectedBackgroundMd; 134 return SkColorSetA(
135 GetSystemColor(kColorId_ResultsTableNormalBackground), 0x14);
139 case kColorId_ResultsTableNormalText: 136 case kColorId_ResultsTableNormalText:
140 case kColorId_ResultsTableHoveredText: 137 case kColorId_ResultsTableHoveredText:
141 case kColorId_ResultsTableSelectedText: 138 case kColorId_ResultsTableSelectedText:
142 case kColorId_ResultsTableNormalHeadline: 139 case kColorId_ResultsTableNormalHeadline:
143 case kColorId_ResultsTableHoveredHeadline: 140 case kColorId_ResultsTableHoveredHeadline:
144 case kColorId_ResultsTableSelectedHeadline: 141 case kColorId_ResultsTableSelectedHeadline:
145 return kResultsTableTextMd; 142 return kResultsTableTextMd;
146 case kColorId_ResultsTableNormalDimmedText: 143 case kColorId_ResultsTableNormalDimmedText:
147 case kColorId_ResultsTableHoveredDimmedText: 144 case kColorId_ResultsTableHoveredDimmedText:
148 case kColorId_ResultsTableSelectedDimmedText: 145 case kColorId_ResultsTableSelectedDimmedText:
149 return kResultsTableDimmedTextMd; 146 return kResultsTableDimmedTextMd;
150 case kColorId_ResultsTableNormalUrl: 147 case kColorId_ResultsTableNormalUrl:
151 case kColorId_ResultsTableHoveredUrl: 148 case kColorId_ResultsTableHoveredUrl:
152 case kColorId_ResultsTableSelectedUrl: 149 case kColorId_ResultsTableSelectedUrl:
153 return kResultsTableUrlMd; 150 return GetSystemColor(kColorId_LinkEnabled);
154 case kColorId_ResultsTableNormalDivider: 151 case kColorId_ResultsTableNormalDivider:
155 case kColorId_ResultsTableHoveredDivider: 152 case kColorId_ResultsTableHoveredDivider:
156 return kResultsTableDividerMd; 153 return kResultsTableDividerMd;
157 case kColorId_ResultsTableSelectedDivider: 154 case kColorId_ResultsTableSelectedDivider:
158 return kResultsTableSelectedDividerMd; 155 return kResultsTableSelectedDividerMd;
159 case kColorId_ResultsTablePositiveText: 156 case kColorId_ResultsTablePositiveText:
160 case kColorId_ResultsTablePositiveHoveredText: 157 case kColorId_ResultsTablePositiveHoveredText:
161 case kColorId_ResultsTablePositiveSelectedText: 158 case kColorId_ResultsTablePositiveSelectedText:
162 return kPositiveTextColorMd; 159 return kPositiveTextColorMd;
163 case kColorId_ResultsTableNegativeText: 160 case kColorId_ResultsTableNegativeText:
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 scoped_ptr<NineImagePainter> stroke_painter, 636 scoped_ptr<NineImagePainter> stroke_painter,
640 const uint8 stroke_alphas[kNumStates]) 637 const uint8 stroke_alphas[kNumStates])
641 : fill_painter(fill_painter.Pass()), 638 : fill_painter(fill_painter.Pass()),
642 fill_alphas(fill_alphas), 639 fill_alphas(fill_alphas),
643 stroke_painter(stroke_painter.Pass()), 640 stroke_painter(stroke_painter.Pass()),
644 stroke_alphas(stroke_alphas) {} 641 stroke_alphas(stroke_alphas) {}
645 642
646 NativeThemeAura::DualPainter::~DualPainter() {} 643 NativeThemeAura::DualPainter::~DualPainter() {}
647 644
648 } // namespace ui 645 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme.gyp ('k') | ui/native_theme/native_theme_dark_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698