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

Side by Side Diff: chrome/browser/themes/theme_properties.cc

Issue 2064903003: Set bookmarks bar text color to #646464 in MD mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Set Incognito MD bookmarks bar text to #8AFFFFFF or 54% white Created 4 years, 6 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) 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 "chrome/browser/themes/theme_properties.h" 5 #include "chrome/browser/themes/theme_properties.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/string_split.h" 10 #include "base/strings/string_split.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 SK_ColorBLACK}; 81 SK_ColorBLACK};
82 constexpr SkColor kDefaultColorBackgroundTabTextIncognito[] = { 82 constexpr SkColor kDefaultColorBackgroundTabTextIncognito[] = {
83 kDefaultColorBackgroundTabText[0], SK_ColorWHITE}; 83 kDefaultColorBackgroundTabText[0], SK_ColorWHITE};
84 #else 84 #else
85 const SkColor kDefaultColorBackgroundTabText[] = { 85 const SkColor kDefaultColorBackgroundTabText[] = {
86 SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorBLACK}; 86 SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorBLACK};
87 const SkColor kDefaultColorBackgroundTabTextIncognito[] = { 87 const SkColor kDefaultColorBackgroundTabTextIncognito[] = {
88 SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorWHITE}; 88 SkColorSetRGB(0x40, 0x40, 0x40), SK_ColorWHITE};
89 #endif // OS_MACOSX 89 #endif // OS_MACOSX
90 90
91 constexpr SkColor kDefaultColorBookmarkText = SK_ColorBLACK; 91 const SkColor kDefaultColorBookmarkText[] = {
92 constexpr SkColor kDefaultColorBookmarkTextIncognito[] = { 92 SK_ColorBLACK, SkColorSetRGB(0x64, 0x64, 0x64)};
Evan Stade 2016/06/14 14:40:30 won't changing this also impact the attached bar a
kylix_rd 2016/06/14 14:47:22 I've uploaded images to the bug report for comment
93 kDefaultColorBookmarkText, SK_ColorWHITE}; 93 const SkColor kDefaultColorBookmarkTextIncognito[] = {
94 SK_ColorBLACK, SkColorSetARGB(0x8A, 0xFF, 0xFF, 0xFF)};
94 95
95 #if defined(OS_WIN) 96 #if defined(OS_WIN)
96 const SkColor kDefaultColorNTPBackground = 97 const SkColor kDefaultColorNTPBackground =
97 color_utils::GetSysSkColor(COLOR_WINDOW); 98 color_utils::GetSysSkColor(COLOR_WINDOW);
98 const SkColor kDefaultColorNTPText = 99 const SkColor kDefaultColorNTPText =
99 color_utils::GetSysSkColor(COLOR_WINDOWTEXT); 100 color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
100 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT); 101 const SkColor kDefaultColorNTPLink = color_utils::GetSysSkColor(COLOR_HOTLIGHT);
101 #else 102 #else
102 // TODO(beng): source from theme provider. 103 // TODO(beng): source from theme provider.
103 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE; 104 constexpr SkColor kDefaultColorNTPBackground = SK_ColorWHITE;
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 return otr ? kDefaultColorToolbarIncognito[mode] 327 return otr ? kDefaultColorToolbarIncognito[mode]
327 : kDefaultColorToolbar[mode]; 328 : kDefaultColorToolbar[mode];
328 case COLOR_TAB_TEXT: 329 case COLOR_TAB_TEXT:
329 return otr ? kDefaultColorTabTextIncognito[mode] 330 return otr ? kDefaultColorTabTextIncognito[mode]
330 : kDefaultColorTabText; 331 : kDefaultColorTabText;
331 case COLOR_BACKGROUND_TAB_TEXT: 332 case COLOR_BACKGROUND_TAB_TEXT:
332 return otr ? kDefaultColorBackgroundTabTextIncognito[mode] 333 return otr ? kDefaultColorBackgroundTabTextIncognito[mode]
333 : kDefaultColorBackgroundTabText[mode]; 334 : kDefaultColorBackgroundTabText[mode];
334 case COLOR_BOOKMARK_TEXT: 335 case COLOR_BOOKMARK_TEXT:
335 return otr ? kDefaultColorBookmarkTextIncognito[mode] 336 return otr ? kDefaultColorBookmarkTextIncognito[mode]
336 : kDefaultColorBookmarkText; 337 : kDefaultColorBookmarkText[mode];
337 case COLOR_NTP_BACKGROUND: 338 case COLOR_NTP_BACKGROUND:
338 return kDefaultColorNTPBackground; 339 return kDefaultColorNTPBackground;
339 case COLOR_NTP_TEXT: 340 case COLOR_NTP_TEXT:
340 return kDefaultColorNTPText; 341 return kDefaultColorNTPText;
341 case COLOR_NTP_LINK: 342 case COLOR_NTP_LINK:
342 return kDefaultColorNTPLink; 343 return kDefaultColorNTPLink;
343 case COLOR_NTP_LINK_UNDERLINE: 344 case COLOR_NTP_LINK_UNDERLINE:
344 return TintForUnderline(kDefaultColorNTPLink); 345 return TintForUnderline(kDefaultColorNTPLink);
345 case COLOR_NTP_HEADER: 346 case COLOR_NTP_HEADER:
346 return kDefaultColorNTPHeader; 347 return kDefaultColorNTPHeader;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 #endif 396 #endif
396 case COLOR_FRAME_INCOGNITO: 397 case COLOR_FRAME_INCOGNITO:
397 case COLOR_FRAME_INCOGNITO_INACTIVE: 398 case COLOR_FRAME_INCOGNITO_INACTIVE:
398 NOTREACHED() << "These values should be queried via their respective " 399 NOTREACHED() << "These values should be queried via their respective "
399 "non-incognito equivalents and an appropriate |otr| " 400 "non-incognito equivalents and an appropriate |otr| "
400 "value."; 401 "value.";
401 default: 402 default:
402 return gfx::kPlaceholderColor; 403 return gfx::kPlaceholderColor;
403 } 404 }
404 } 405 }
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