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

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

Issue 205153003: linux_aura: Don't inject black in WrenchMenu::GetForegroundColor(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sky rename request Created 6 years, 9 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 | « ui/native_theme/native_theme.h ('k') | ui/views/controls/menu/menu_delegate.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/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 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 case kColorId_ButtonHighlightColor: 531 case kColorId_ButtonHighlightColor:
532 return kButtonHighlightColor; 532 return kButtonHighlightColor;
533 case kColorId_ButtonHoverColor: 533 case kColorId_ButtonHoverColor:
534 return kButtonHoverColor; 534 return kButtonHoverColor;
535 535
536 // MenuItem 536 // MenuItem
537 case kColorId_EnabledMenuItemForegroundColor: 537 case kColorId_EnabledMenuItemForegroundColor:
538 return kEnabledMenuItemForegroundColor; 538 return kEnabledMenuItemForegroundColor;
539 case kColorId_DisabledMenuItemForegroundColor: 539 case kColorId_DisabledMenuItemForegroundColor:
540 return kDisabledMenuItemForegroundColor; 540 return kDisabledMenuItemForegroundColor;
541 case kColorId_DisabledEmphasizedMenuItemForegroundColor:
542 return SK_ColorBLACK;
541 case kColorId_FocusedMenuItemBackgroundColor: 543 case kColorId_FocusedMenuItemBackgroundColor:
542 return kFocusedMenuItemBackgroundColor; 544 return kFocusedMenuItemBackgroundColor;
543 case kColorId_MenuSeparatorColor: 545 case kColorId_MenuSeparatorColor:
544 return kMenuSeparatorColor; 546 return kMenuSeparatorColor;
545 547
546 // Label 548 // Label
547 case kColorId_LabelEnabledColor: 549 case kColorId_LabelEnabledColor:
548 return system_colors_[COLOR_BTNTEXT]; 550 return system_colors_[COLOR_BTNTEXT];
549 case kColorId_LabelDisabledColor: 551 case kColorId_LabelDisabledColor:
550 return system_colors_[COLOR_GRAYTEXT]; 552 return system_colors_[COLOR_GRAYTEXT];
(...skipping 1553 matching lines...) Expand 10 before | Expand all | Expand 10 after
2104 handle = open_theme_(NULL, L"Spin"); 2106 handle = open_theme_(NULL, L"Spin");
2105 break; 2107 break;
2106 default: 2108 default:
2107 NOTREACHED(); 2109 NOTREACHED();
2108 } 2110 }
2109 theme_handles_[theme_name] = handle; 2111 theme_handles_[theme_name] = handle;
2110 return handle; 2112 return handle;
2111 } 2113 }
2112 2114
2113 } // namespace ui 2115 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | ui/views/controls/menu/menu_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698