ui/views/mus/aura_init.h - Issue 2174983002: OS_LINUX and OS_ANDROID are mutually exclusive.

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

Unified Diff: ui/views/mus/aura_init.h

Issue 2174983002: OS_LINUX and OS_ANDROID are mutually exclusive. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 5 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:

Index: ui/views/mus/aura_init.h

diff --git a/ui/views/mus/aura_init.h b/ui/views/mus/aura_init.h

index 9330845f17bd3d33bac0c44990499b78cb8dac96..d76827668e79b75dcd135ca18426a20e99c62d17 100644

--- a/ui/views/mus/aura_init.h

+++ b/ui/views/mus/aura_init.h

@@ -38,7 +38,7 @@ class VIEWS_MUS_EXPORT AuraInit {

private:

void InitializeResources(shell::Connector* connector);

-#if defined(OS_LINUX) && !defined(OS_ANDROID)

+#if defined(OS_LINUX)

sk_sp<font_service::FontLoader> font_loader_;

#endif

« no previous file with comments | « services/shell/runner/host/child_process_host.cc ('k') | ui/views/mus/aura_init.cc » ('j') | no next file with comments »