Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 486 const SkColor kResultsTableSelectedUrlColor = SK_ColorWHITE; | 486 const SkColor kResultsTableSelectedUrlColor = SK_ColorWHITE; |
| 487 | 487 |
| 488 switch (color_id) { | 488 switch (color_id) { |
| 489 // Windows | 489 // Windows |
| 490 case kColorId_WindowBackground: | 490 case kColorId_WindowBackground: |
| 491 return system_colors_[COLOR_WINDOW]; | 491 return system_colors_[COLOR_WINDOW]; |
| 492 | 492 |
| 493 // Dialogs | 493 // Dialogs |
| 494 case kColorId_DialogBackground: | 494 case kColorId_DialogBackground: |
| 495 case kColorId_BubbleBackground: | 495 case kColorId_BubbleBackground: |
| 496 if (ui::MaterialDesignController::IsSecondaryUiMaterial()) { | |
| 497 return GetAuraColor(color_id, this); | |
| 498 } | |
|
Evan Stade
2016/08/23 19:31:05
I think you can just break in the md case, and let
Jane
2016/08/23 20:06:05
Done.
| |
| 496 return color_utils::IsInvertedColorScheme() ? | 499 return color_utils::IsInvertedColorScheme() ? |
| 497 color_utils::InvertColor(kDialogBackgroundColor) : | 500 color_utils::InvertColor(kDialogBackgroundColor) : |
| 498 kDialogBackgroundColor; | 501 kDialogBackgroundColor; |
| 499 | 502 |
| 500 // FocusableBorder | 503 // FocusableBorder |
| 501 case kColorId_FocusedBorderColor: | 504 case kColorId_FocusedBorderColor: |
| 502 return kFocusedBorderColor; | 505 return kFocusedBorderColor; |
| 503 case kColorId_UnfocusedBorderColor: | 506 case kColorId_UnfocusedBorderColor: |
| 504 return kUnfocusedBorderColor; | 507 return kUnfocusedBorderColor; |
| 505 | 508 |
| (...skipping 1554 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2060 break; | 2063 break; |
| 2061 case LAST: | 2064 case LAST: |
| 2062 NOTREACHED(); | 2065 NOTREACHED(); |
| 2063 break; | 2066 break; |
| 2064 } | 2067 } |
| 2065 theme_handles_[theme_name] = handle; | 2068 theme_handles_[theme_name] = handle; |
| 2066 return handle; | 2069 return handle; |
| 2067 } | 2070 } |
| 2068 | 2071 |
| 2069 } // namespace ui | 2072 } // namespace ui |
| OLD | NEW |