ui/views/mus/aura_init.cc - Issue 1641003002: [exp] ash: Ash in Mus.

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.cc

Issue 1641003002: [exp] ash: Ash in Mus. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: tot-merge Created 4 years, 11 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.cc

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

index f7f30b0f24a70bd1b0d5cb857f3de3f924723782..a5f812d521f19b1e3f237f9d3060f8ebe1b9ec7a 100644

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

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

@@ -52,7 +52,9 @@ class MusViewsDelegate : public ViewsDelegate {

AuraInit::AuraInit(mojo::ApplicationImpl* app, const std::string& resource_file)

: resource_file_(resource_file),

- views_delegate_(new MusViewsDelegate) {

+ views_delegate_(views::ViewsDelegate::GetInstance()

+ ? nullptr

+ : new MusViewsDelegate) {

aura::Env::CreateInstance(false);

InitializeResources(app);

« no previous file with comments | « ui/base/user_activity/user_activity_detector.cc ('k') | no next file » | no next file with comments »