ash/shell/content_client/shell_browser_main_parts.cc - Issue 1159033008: Refactor ViewsDelegate singleton

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: ash/shell/content_client/shell_browser_main_parts.cc

Issue 1159033008: Refactor ViewsDelegate singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed review comments Created 5 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:

Index: ash/shell/content_client/shell_browser_main_parts.cc

diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc

index a7a7c57d47bfc755d35e09dbb108db0a31e067b5..ecac374a80966674779282d9e0381780e1bfc631 100644

--- a/ash/shell/content_client/shell_browser_main_parts.cc

+++ b/ash/shell/content_client/shell_browser_main_parts.cc

@@ -108,8 +108,8 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {

false, net_log_.get()));

// A ViewsDelegate is required.

- if (!views::ViewsDelegate::views_delegate)

- views::ViewsDelegate::views_delegate = new ShellViewsDelegate;

+ if (!views::ViewsDelegate::GetInstance())

+ views_delegate_.reset(new ShellViewsDelegate);

delegate_ = new ash::shell::ShellDelegateImpl;

// The global message center state must be initialized absent