chrome/browser/ui/views/harmony/harmony_typography_provider.h - Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors.

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: chrome/browser/ui/views/harmony/harmony_typography_provider.h

Issue 2910153002: Remove views::Label::SetDisabledColor(). Replace with typography colors. (Closed)

Patch Set: rebase for r476345 Created 3 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

« chrome/browser/chromeos/ui/idle_app_name_notification_view.cc ('K') | « chrome/browser/ui/views/harmony/chrome_typography.cc ('k') | chrome/browser/ui/views/harmony/harmony_typography_provider.cc » ('j') | ui/views/controls/label.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2017 The Chromium Authors. All rights reserved.	1 // Copyright 2017 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 CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_TYPOGRAPHY_PROVIDER_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_TYPOGRAPHY_PROVIDER_H_

6 #define CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_TYPOGRAPHY_PROVIDER_H_	6 #define CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_TYPOGRAPHY_PROVIDER_H_

7	7

8 #include "base/macros.h"	8 #include "base/macros.h"

9 #include "ui/views/style/typography_provider.h"	9 #include "ui/views/style/typography_provider.h"

10	10

11 // TypographyProvider implementing the Harmony spec.	11 // TypographyProvider implementing the Harmony spec.

12 class HarmonyTypographyProvider : public views::TypographyProvider {	12 class HarmonyTypographyProvider : public views::TypographyProvider {

13 public:	13 public:

14 HarmonyTypographyProvider() = default;	14 HarmonyTypographyProvider() = default;

15	15

16 // TypographyProvider:	16 // TypographyProvider:

17 const gfx::FontList& GetFont(int text_context, int text_style) const override;	17 const gfx::FontList& GetFont(int context, int style) const override;

18 SkColor GetColor(int context, int style) const override;	18 SkColor GetColor(int context,

	19 int style,

	20 const ui::NativeTheme& theme) const override;

19 int GetLineHeight(int context, int style) const override;	21 int GetLineHeight(int context, int style) const override;

20	22

21 private:	23 private:

22 DISALLOW_COPY_AND_ASSIGN(HarmonyTypographyProvider);	24 DISALLOW_COPY_AND_ASSIGN(HarmonyTypographyProvider);

23 };	25 };

24	26

25 #endif // CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_TYPOGRAPHY_PROVIDER_H_	27 #endif // CHROME_BROWSER_UI_VIEWS_HARMONY_HARMONY_TYPOGRAPHY_PROVIDER_H_

OLD	NEW