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

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

Issue 1454983003: Remove unused color from NativeTheme. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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_dark_aura.cc ('k') | 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/native_theme_win.h" 5 #include "ui/native_theme/native_theme_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <uxtheme.h> 8 #include <uxtheme.h>
9 #include <vsstyle.h> 9 #include <vsstyle.h>
10 #include <vssym32.h> 10 #include <vssym32.h>
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 case kColorId_ResultsTableNormalUrl: 604 case kColorId_ResultsTableNormalUrl:
605 return color_utils::GetReadableColor(kUrlTextColor, 605 return color_utils::GetReadableColor(kUrlTextColor,
606 system_colors_[COLOR_WINDOW]); 606 system_colors_[COLOR_WINDOW]);
607 case kColorId_ResultsTableHoveredUrl: 607 case kColorId_ResultsTableHoveredUrl:
608 return color_utils::GetReadableColor( 608 return color_utils::GetReadableColor(
609 kUrlTextColor, 609 kUrlTextColor,
610 GetSystemColor(kColorId_ResultsTableHoveredBackground)); 610 GetSystemColor(kColorId_ResultsTableHoveredBackground));
611 case kColorId_ResultsTableSelectedUrl: 611 case kColorId_ResultsTableSelectedUrl:
612 return color_utils::GetReadableColor(kUrlTextColor, 612 return color_utils::GetReadableColor(kUrlTextColor,
613 system_colors_[COLOR_HIGHLIGHT]); 613 system_colors_[COLOR_HIGHLIGHT]);
614 case kColorId_ResultsTableNormalDivider:
615 return color_utils::AlphaBlend(system_colors_[COLOR_WINDOWTEXT],
616 system_colors_[COLOR_WINDOW], 0x34);
617 case kColorId_ResultsTableHoveredDivider:
618 return color_utils::AlphaBlend(
619 system_colors_[COLOR_WINDOWTEXT],
620 GetSystemColor(kColorId_ResultsTableHoveredBackground), 0x34);
621 case kColorId_ResultsTableSelectedDivider:
622 return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHTTEXT],
623 system_colors_[COLOR_HIGHLIGHT], 0x34);
624 case kColorId_ResultsTablePositiveText: 614 case kColorId_ResultsTablePositiveText:
625 return color_utils::GetReadableColor(kPositiveTextColor, 615 return color_utils::GetReadableColor(kPositiveTextColor,
626 system_colors_[COLOR_WINDOW]); 616 system_colors_[COLOR_WINDOW]);
627 case kColorId_ResultsTablePositiveHoveredText: 617 case kColorId_ResultsTablePositiveHoveredText:
628 return color_utils::GetReadableColor( 618 return color_utils::GetReadableColor(
629 kPositiveTextColor, 619 kPositiveTextColor,
630 GetSystemColor(kColorId_ResultsTableHoveredBackground)); 620 GetSystemColor(kColorId_ResultsTableHoveredBackground));
631 case kColorId_ResultsTablePositiveSelectedText: 621 case kColorId_ResultsTablePositiveSelectedText:
632 return color_utils::GetReadableColor(kPositiveTextColor, 622 return color_utils::GetReadableColor(kPositiveTextColor,
633 system_colors_[COLOR_HIGHLIGHT]); 623 system_colors_[COLOR_HIGHLIGHT]);
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
2066 break; 2056 break;
2067 case LAST: 2057 case LAST:
2068 NOTREACHED(); 2058 NOTREACHED();
2069 break; 2059 break;
2070 } 2060 }
2071 theme_handles_[theme_name] = handle; 2061 theme_handles_[theme_name] = handle;
2072 return handle; 2062 return handle;
2073 } 2063 }
2074 2064
2075 } // namespace ui 2065 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_dark_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698