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

Side by Side Diff: ui/native_theme/fallback_theme.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/common_theme.cc ('k') | ui/native_theme/native_theme.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/fallback_theme.h" 5 #include "ui/native_theme/fallback_theme.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "ui/gfx/color_utils.h" 9 #include "ui/gfx/color_utils.h"
10 #include "ui/gfx/skia_utils_gtk.h" 10 #include "ui/gfx/skia_utils_gtk.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 case kColorId_ButtonHighlightColor: 110 case kColorId_ButtonHighlightColor:
111 return kButtonHighlightColor; 111 return kButtonHighlightColor;
112 case kColorId_ButtonHoverColor: 112 case kColorId_ButtonHoverColor:
113 return kButtonHoverColor; 113 return kButtonHoverColor;
114 114
115 // MenuItem 115 // MenuItem
116 case kColorId_EnabledMenuItemForegroundColor: 116 case kColorId_EnabledMenuItemForegroundColor:
117 return kEnabledMenuItemForegroundColor; 117 return kEnabledMenuItemForegroundColor;
118 case kColorId_DisabledMenuItemForegroundColor: 118 case kColorId_DisabledMenuItemForegroundColor:
119 return kDisabledMenuItemForegroundColor; 119 return kDisabledMenuItemForegroundColor;
120 case kColorId_DisabledEmphasizedMenuItemForegroundColor:
121 return SK_ColorBLACK;
120 case kColorId_SelectedMenuItemForegroundColor: 122 case kColorId_SelectedMenuItemForegroundColor:
121 return kEnabledMenuItemForegroundColor; 123 return kEnabledMenuItemForegroundColor;
122 case kColorId_FocusedMenuItemBackgroundColor: 124 case kColorId_FocusedMenuItemBackgroundColor:
123 return kFocusedMenuItemBackgroundColor; 125 return kFocusedMenuItemBackgroundColor;
124 case kColorId_HoverMenuItemBackgroundColor: 126 case kColorId_HoverMenuItemBackgroundColor:
125 return kHoverMenuItemBackgroundColor; 127 return kHoverMenuItemBackgroundColor;
126 case kColorId_MenuSeparatorColor: 128 case kColorId_MenuSeparatorColor:
127 return kMenuSeparatorColor; 129 return kMenuSeparatorColor;
128 case kColorId_EnabledMenuButtonBorderColor: 130 case kColorId_EnabledMenuButtonBorderColor:
129 return kEnabledMenuButtonBorderColor; 131 return kEnabledMenuButtonBorderColor;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 return kMenuBackgroundColor; 188 return kMenuBackgroundColor;
187 case kColorId_MenuBorderColor: 189 case kColorId_MenuBorderColor:
188 NOTREACHED(); 190 NOTREACHED();
189 break; 191 break;
190 } 192 }
191 193
192 return kInvalidColorIdColor; 194 return kInvalidColorIdColor;
193 } 195 }
194 196
195 } // namespace ui 197 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/common_theme.cc ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698