chrome/browser/ui/views/toolbar_view.cc - Issue 8609002: CrOs: Remove 16 exit time destructors and 11 static initializers.

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

Issue 8609002: CrOs: Remove 16 exit time destructors and 11 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 years, 1 month 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/toolbar_view.cc

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

index d3bf8eec4de773a2c4e91675f0e8f83c46fa5583..0208973ed5c52021247d483f77fc725e66453fcf 100644

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

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

@@ -473,7 +473,7 @@ gfx::Size ToolbarView::GetPreferredSize() {

browser_actions_->GetPreferredSize().width() +

app_menu_->GetPreferredSize().width() + kEdgeSpacing;

- static SkBitmap normal_background;

+ CR_DEFINE_STATIC_LOCAL(SkBitmap, normal_background, ());

if (normal_background.isNull()) {

ResourceBundle& rb = ResourceBundle::GetSharedInstance();

normal_background = *rb.GetBitmapNamed(IDR_CONTENT_TOP_CENTER);