chrome/browser/ui/views/chrome_browser_main_extra_parts_views.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: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.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: chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

index f65a1527629aed30c17ae9bdaea044450667acc4..f10252d7fae61e5655acd4fd973c24c6054a359b 100644

--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

@@ -22,8 +22,8 @@ ChromeBrowserMainExtraPartsViews::~ChromeBrowserMainExtraPartsViews() {

void ChromeBrowserMainExtraPartsViews::ToolkitInitialized() {

// The delegate needs to be set before any UI is created so that windows

// display the correct icon.

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

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

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

+ views_delegate_.reset(new ChromeViewsDelegate);

SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());