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

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

Issue 2077803002: Modify the ommnibox dropdown colors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@theme_cleanup
Patch Set: 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 | « chrome/browser/ui/views/omnibox/omnibox_result_view.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 <stddef.h> 8 #include <stddef.h>
9 #include <uxtheme.h> 9 #include <uxtheme.h>
10 #include <vsstyle.h> 10 #include <vsstyle.h>
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 PaintWindowResizeGripper(hdc, rect); 458 PaintWindowResizeGripper(hdc, rect);
459 return; 459 return;
460 case kSliderTrack: 460 case kSliderTrack:
461 case kSliderThumb: 461 case kSliderThumb:
462 case kMaxPart: 462 case kMaxPart:
463 NOTREACHED(); 463 NOTREACHED();
464 } 464 }
465 } 465 }
466 466
467 SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const { 467 SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
468 if (!ui::MaterialDesignController::IsModeMaterial()) { 468 const bool md = ui::MaterialDesignController::IsModeMaterial();
469 if (!md) {
469 // Link: 470 // Link:
470 const SkColor kLinkPressedColor = SkColorSetRGB(200, 0, 0); 471 const SkColor kLinkPressedColor = SkColorSetRGB(200, 0, 0);
471 472
472 switch (color_id) { 473 switch (color_id) {
473 // Link 474 // Link
474 case kColorId_LinkDisabled: 475 case kColorId_LinkDisabled:
475 return system_colors_[COLOR_WINDOWTEXT]; 476 return system_colors_[COLOR_WINDOWTEXT];
476 case kColorId_LinkEnabled: 477 case kColorId_LinkEnabled:
477 return system_colors_[COLOR_HOTLIGHT]; 478 return system_colors_[COLOR_HOTLIGHT];
478 case kColorId_LinkPressed: 479 case kColorId_LinkPressed:
(...skipping 15 matching lines...) Expand all
494 const SkColor kButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255); 495 const SkColor kButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255);
495 const SkColor kButtonHoverColor = SkColorSetRGB(6, 45, 117); 496 const SkColor kButtonHoverColor = SkColorSetRGB(6, 45, 117);
496 const SkColor kCallToActionColorInvert = gfx::kGoogleBlue300; 497 const SkColor kCallToActionColorInvert = gfx::kGoogleBlue300;
497 // MenuItem: 498 // MenuItem:
498 const SkColor kMenuSchemeHighlightBackgroundColorInvert = 499 const SkColor kMenuSchemeHighlightBackgroundColorInvert =
499 SkColorSetRGB(0x30, 0x30, 0x30); 500 SkColorSetRGB(0x30, 0x30, 0x30);
500 // Table: 501 // Table:
501 const SkColor kPositiveTextColor = SkColorSetRGB(0x0b, 0x80, 0x43); 502 const SkColor kPositiveTextColor = SkColorSetRGB(0x0b, 0x80, 0x43);
502 const SkColor kNegativeTextColor = SkColorSetRGB(0xc5, 0x39, 0x29); 503 const SkColor kNegativeTextColor = SkColorSetRGB(0xc5, 0x39, 0x29);
503 // Results Tables: 504 // Results Tables:
504 const SkColor kResultsTableUrlColor = SkColorSetRGB(0x0b, 0x80, 0x43); 505 const SkColor kResultsTableUrlColor =
506 md ? gfx::kGoogleBlue700 : SkColorSetRGB(0x0b, 0x80, 0x43);
507 const SkColor kResultsTableSelectedUrlColor = SK_ColorWHITE;
505 508
506 switch (color_id) { 509 switch (color_id) {
507 // Windows 510 // Windows
508 case kColorId_WindowBackground: 511 case kColorId_WindowBackground:
509 return system_colors_[COLOR_WINDOW]; 512 return system_colors_[COLOR_WINDOW];
510 513
511 // Dialogs 514 // Dialogs
512 case kColorId_DialogBackground: 515 case kColorId_DialogBackground:
513 case kColorId_BubbleBackground: 516 case kColorId_BubbleBackground:
514 return color_utils::IsInvertedColorScheme() ? 517 return color_utils::IsInvertedColorScheme() ?
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 return color_utils::AlphaBlend( 620 return color_utils::AlphaBlend(
618 system_colors_[COLOR_WINDOWTEXT], 621 system_colors_[COLOR_WINDOWTEXT],
619 GetSystemColor(kColorId_ResultsTableHoveredBackground), 0x80); 622 GetSystemColor(kColorId_ResultsTableHoveredBackground), 0x80);
620 case kColorId_ResultsTableSelectedDimmedText: 623 case kColorId_ResultsTableSelectedDimmedText:
621 return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHTTEXT], 624 return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHTTEXT],
622 system_colors_[COLOR_HIGHLIGHT], 0x80); 625 system_colors_[COLOR_HIGHLIGHT], 0x80);
623 case kColorId_ResultsTableNormalUrl: 626 case kColorId_ResultsTableNormalUrl:
624 return color_utils::GetReadableColor(kResultsTableUrlColor, 627 return color_utils::GetReadableColor(kResultsTableUrlColor,
625 system_colors_[COLOR_WINDOW]); 628 system_colors_[COLOR_WINDOW]);
626 case kColorId_ResultsTableHoveredUrl: 629 case kColorId_ResultsTableHoveredUrl:
627 return color_utils::GetReadableColor( 630 return color_utils::PickContrastingColor(
628 kResultsTableUrlColor, 631 kResultsTableUrlColor, kResultsTableSelectedUrlColor,
629 GetSystemColor(kColorId_ResultsTableHoveredBackground)); 632 GetSystemColor(kColorId_ResultsTableHoveredBackground));
630 case kColorId_ResultsTableSelectedUrl: 633 case kColorId_ResultsTableSelectedUrl:
631 return color_utils::GetReadableColor(kResultsTableUrlColor, 634 return color_utils::PickContrastingColor(
632 system_colors_[COLOR_HIGHLIGHT]); 635 kResultsTableUrlColor, kResultsTableSelectedUrlColor,
636 system_colors_[COLOR_HIGHLIGHT]);
633 case kColorId_ResultsTablePositiveText: 637 case kColorId_ResultsTablePositiveText:
634 return color_utils::GetReadableColor(kPositiveTextColor, 638 return color_utils::GetReadableColor(kPositiveTextColor,
635 system_colors_[COLOR_WINDOW]); 639 system_colors_[COLOR_WINDOW]);
636 case kColorId_ResultsTablePositiveHoveredText: 640 case kColorId_ResultsTablePositiveHoveredText:
637 return color_utils::GetReadableColor( 641 return color_utils::GetReadableColor(
638 kPositiveTextColor, 642 kPositiveTextColor,
639 GetSystemColor(kColorId_ResultsTableHoveredBackground)); 643 GetSystemColor(kColorId_ResultsTableHoveredBackground));
640 case kColorId_ResultsTablePositiveSelectedText: 644 case kColorId_ResultsTablePositiveSelectedText:
641 return color_utils::GetReadableColor(kPositiveTextColor, 645 return color_utils::GetReadableColor(kPositiveTextColor,
642 system_colors_[COLOR_HIGHLIGHT]); 646 system_colors_[COLOR_HIGHLIGHT]);
(...skipping 1432 matching lines...) Expand 10 before | Expand all | Expand 10 after
2075 break; 2079 break;
2076 case LAST: 2080 case LAST:
2077 NOTREACHED(); 2081 NOTREACHED();
2078 break; 2082 break;
2079 } 2083 }
2080 theme_handles_[theme_name] = handle; 2084 theme_handles_[theme_name] = handle;
2081 return handle; 2085 return handle;
2082 } 2086 }
2083 2087
2084 } // namespace ui 2088 } // namespace ui
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698