chrome/browser/content_settings/tab_specific_content_settings.cc - Issue 8568039: Revert 110235 - chrome: Remove 14 exit time destructors and 2 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/content_settings/tab_specific_content_settings.cc

Issue 8568039: Revert 110235 - chrome: Remove 14 exit time destructors and 2 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/content_settings/tab_specific_content_settings.cc

===================================================================

--- chrome/browser/content_settings/tab_specific_content_settings.cc (revision 110237)

+++ chrome/browser/content_settings/tab_specific_content_settings.cc (working copy)

@@ -199,7 +199,7 @@

if (blocked_resources_[content_type].get()) {

return *blocked_resources_[content_type];

} else {

- CR_DEFINE_STATIC_LOCAL(std::set<std::string>, empty_set, ());

+ static std::set<std::string> empty_set;

return empty_set;

}

« no previous file with comments | « chrome/browser/character_encoding.cc ('k') | chrome/browser/google/google_update_settings_posix.cc » ('j') | no next file with comments »