ui/native_theme/native_theme.h - Issue 205153003: linux_aura: Don't inject black in WrenchMenu::GetForegroundColor().

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/native_theme/native_theme.h

Issue 205153003: linux_aura: Don't inject black in WrenchMenu::GetForegroundColor(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Style nit 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

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 #ifndef UI_NATIVE_THEME_NATIVE_THEME_H_	5 #ifndef UI_NATIVE_THEME_NATIVE_THEME_H_

6 #define UI_NATIVE_THEME_NATIVE_THEME_H_	6 #define UI_NATIVE_THEME_NATIVE_THEME_H_

7	7

8 #include "third_party/skia/include/core/SkColor.h"	8 #include "third_party/skia/include/core/SkColor.h"

9 #include "ui/gfx/native_widget_types.h"	9 #include "ui/gfx/native_widget_types.h"

10 #include "ui/native_theme/native_theme_export.h"	10 #include "ui/native_theme/native_theme_export.h"

(...skipping 225 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
236 kColorId_UnfocusedBorderColor,	236 kColorId_UnfocusedBorderColor,

237 // Button	237 // Button

238 kColorId_ButtonBackgroundColor,	238 kColorId_ButtonBackgroundColor,

239 kColorId_ButtonEnabledColor,	239 kColorId_ButtonEnabledColor,

240 kColorId_ButtonDisabledColor,	240 kColorId_ButtonDisabledColor,

241 kColorId_ButtonHighlightColor,	241 kColorId_ButtonHighlightColor,

242 kColorId_ButtonHoverColor,	242 kColorId_ButtonHoverColor,

243 // MenuItem	243 // MenuItem

244 kColorId_EnabledMenuItemForegroundColor,	244 kColorId_EnabledMenuItemForegroundColor,

245 kColorId_DisabledMenuItemForegroundColor,	245 kColorId_DisabledMenuItemForegroundColor,

	246 kColorId_BoldedDisabledMenuItemForegroundColor,

246 kColorId_SelectedMenuItemForegroundColor,	247 kColorId_SelectedMenuItemForegroundColor,

247 kColorId_FocusedMenuItemBackgroundColor,	248 kColorId_FocusedMenuItemBackgroundColor,

248 kColorId_HoverMenuItemBackgroundColor,	249 kColorId_HoverMenuItemBackgroundColor,

249 kColorId_MenuSeparatorColor,	250 kColorId_MenuSeparatorColor,

250 kColorId_MenuBackgroundColor,	251 kColorId_MenuBackgroundColor,

251 kColorId_MenuBorderColor,	252 kColorId_MenuBorderColor,

252 // MenuButton - buttons in wrench menu	253 // MenuButton - buttons in wrench menu

253 kColorId_EnabledMenuButtonBorderColor,	254 kColorId_EnabledMenuButtonBorderColor,

254 kColorId_FocusedMenuButtonBorderColor,	255 kColorId_FocusedMenuButtonBorderColor,

255 kColorId_HoverMenuButtonBorderColor,	256 kColorId_HoverMenuButtonBorderColor,

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
300 unsigned int thumb_inactive_color_;	301 unsigned int thumb_inactive_color_;

301 unsigned int thumb_active_color_;	302 unsigned int thumb_active_color_;

302 unsigned int track_color_;	303 unsigned int track_color_;

303	304

304 DISALLOW_COPY_AND_ASSIGN(NativeTheme);	305 DISALLOW_COPY_AND_ASSIGN(NativeTheme);

305 };	306 };

306	307

307 } // namespace ui	308 } // namespace ui

308	309

309 #endif // UI_NATIVE_THEME_NATIVE_THEME_H_	310 #endif // UI_NATIVE_THEME_NATIVE_THEME_H_

OLD	NEW

« no previous file with comments | « ui/native_theme/fallback_theme.cc ('k') | ui/native_theme/native_theme_win.cc » ('j') | ui/views/controls/menu/menu_delegate.h » ('J')