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

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

Issue 222613005: views: Fix linux omnibox colors by refactoring omnibox_result_view.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move table out of method so arraysize() works. Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | ui/native_theme/native_theme.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/fallback_theme.h" 5 #include "ui/native_theme/fallback_theme.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "ui/gfx/color_utils.h" 9 #include "ui/gfx/color_utils.h"
10 #include "ui/gfx/skia_utils_gtk.h" 10 #include "ui/gfx/skia_utils_gtk.h"
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 SkColorSetRGB(0xEE, 0xEE, 0xEE); 73 SkColorSetRGB(0xEE, 0xEE, 0xEE);
74 static const SkColor kTreeArrowColor = SkColorSetRGB(0x7A, 0x7A, 0x7A); 74 static const SkColor kTreeArrowColor = SkColorSetRGB(0x7A, 0x7A, 0x7A);
75 // Table 75 // Table
76 static const SkColor kTableBackground = SK_ColorWHITE; 76 static const SkColor kTableBackground = SK_ColorWHITE;
77 static const SkColor kTableTextColor = SK_ColorBLACK; 77 static const SkColor kTableTextColor = SK_ColorBLACK;
78 static const SkColor kTableSelectedTextColor = SK_ColorBLACK; 78 static const SkColor kTableSelectedTextColor = SK_ColorBLACK;
79 static const SkColor kTableSelectionBackgroundColor = 79 static const SkColor kTableSelectionBackgroundColor =
80 SkColorSetRGB(0xEE, 0xEE, 0xEE); 80 SkColorSetRGB(0xEE, 0xEE, 0xEE);
81 static const SkColor kTableGroupingIndicatorColor = 81 static const SkColor kTableGroupingIndicatorColor =
82 SkColorSetRGB(0xCC, 0xCC, 0xCC); 82 SkColorSetRGB(0xCC, 0xCC, 0xCC);
83 // Results Tables
84 static const SkColor kResultsTableHoveredBackground =
85 color_utils::AlphaBlend(kTextfieldSelectionBackgroundFocused,
86 kTextfieldDefaultBackground, 0x40);
87 static const SkColor kResultsTableNormalText = color_utils::AlphaBlend(
88 SK_ColorBLACK, kTextfieldDefaultBackground, 0xDD);
89 static const SkColor kResultsTableHoveredText = color_utils::AlphaBlend(
90 SK_ColorBLACK, kResultsTableHoveredBackground, 0xDD);
91 static const SkColor kResultsTableSelectedText = color_utils::AlphaBlend(
92 SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xDD);
93 static const SkColor kResultsTableNormalDimmedText = color_utils::AlphaBlend(
94 SK_ColorBLACK, kTextfieldDefaultBackground, 0xBB);
95 static const SkColor kResultsTableHoveredDimmedText = color_utils::AlphaBlend(
96 SK_ColorBLACK, kResultsTableHoveredBackground, 0xBB);
97 static const SkColor kResultsTableSelectedDimmedText =
98 color_utils::AlphaBlend(
99 SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xBB);
100 static const SkColor kResultsTableSelectedOrHoveredUrl =
101 SkColorSetARGB(0xff, 0x00, 0x66, 0x22);
102 static const SkColor kResultsTableNormalDivider = color_utils::AlphaBlend(
103 kResultsTableNormalText, kTextfieldDefaultBackground, 0x34);
104 static const SkColor kResultsTableHoveredDivider = color_utils::AlphaBlend(
105 kResultsTableHoveredText, kResultsTableHoveredBackground, 0x34);
106 static const SkColor kResultsTabSelectedDivider = color_utils::AlphaBlend(
107 kResultsTableSelectedText, kTextfieldSelectionBackgroundFocused, 0x34);
83 108
84 SkColor color; 109 SkColor color;
85 if (CommonThemeGetSystemColor(color_id, &color)) 110 if (CommonThemeGetSystemColor(color_id, &color))
86 return color; 111 return color;
87 112
88 switch (color_id) { 113 switch (color_id) {
89 // Windows 114 // Windows
90 case kColorId_WindowBackground: 115 case kColorId_WindowBackground:
91 return kWindowBackgroundColor; 116 return kWindowBackgroundColor;
92 117
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 return kTableTextColor; 202 return kTableTextColor;
178 case kColorId_TableSelectedText: 203 case kColorId_TableSelectedText:
179 case kColorId_TableSelectedTextUnfocused: 204 case kColorId_TableSelectedTextUnfocused:
180 return kTableSelectedTextColor; 205 return kTableSelectedTextColor;
181 case kColorId_TableSelectionBackgroundFocused: 206 case kColorId_TableSelectionBackgroundFocused:
182 case kColorId_TableSelectionBackgroundUnfocused: 207 case kColorId_TableSelectionBackgroundUnfocused:
183 return kTableSelectionBackgroundColor; 208 return kTableSelectionBackgroundColor;
184 case kColorId_TableGroupingIndicatorColor: 209 case kColorId_TableGroupingIndicatorColor:
185 return kTableGroupingIndicatorColor; 210 return kTableGroupingIndicatorColor;
186 211
212 // Results Tables
213 case kColorId_ResultsTableNormalBackground:
214 return kTextfieldDefaultBackground;
215 case kColorId_ResultsTableHoveredBackground:
216 return kResultsTableHoveredBackground;
217 case kColorId_ResultsTableSelectedBackground:
218 return kTextfieldSelectionBackgroundFocused;
219 case kColorId_ResultsTableNormalText:
220 return kResultsTableNormalText;
221 case kColorId_ResultsTableHoveredText:
222 return kResultsTableHoveredText;
223 case kColorId_ResultsTableSelectedText:
224 return kResultsTableSelectedText;
225 case kColorId_ResultsTableNormalDimmedText:
226 return kResultsTableNormalDimmedText;
227 case kColorId_ResultsTableHoveredDimmedText:
228 return kResultsTableHoveredDimmedText;
229 case kColorId_ResultsTableSelectedDimmedText:
230 return kResultsTableSelectedDimmedText;
231 case kColorId_ResultsTableNormalUrl:
232 return kTextfieldSelectionColor;
233 case kColorId_ResultsTableHoveredUrl:
234 case kColorId_ResultsTableSelectedUrl:
235 return kResultsTableSelectedOrHoveredUrl;
236 case kColorId_ResultsTableNormalDivider:
237 return kResultsTableNormalDivider;
238 case kColorId_ResultsTableHoveredDivider:
239 return kResultsTableHoveredDivider;
240 case kColorId_ResultsTableSelectedDivider:
241 return kResultsTabSelectedDivider;
242
187 case kColorId_MenuBackgroundColor: 243 case kColorId_MenuBackgroundColor:
188 return kMenuBackgroundColor; 244 return kMenuBackgroundColor;
189 case kColorId_MenuBorderColor: 245 case kColorId_MenuBorderColor:
190 NOTREACHED(); 246 NOTREACHED();
191 break; 247 break;
192 } 248 }
193 249
194 return kInvalidColorIdColor; 250 return kInvalidColorIdColor;
195 } 251 }
196 252
197 } // namespace ui 253 } // namespace ui
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698