Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: components/content_settings/core/browser/website_settings_registry.cc

Issue 2733283002: Require explicit selection of traits for LazyInstance (Closed)
Patch Set: Created 3 years, 9 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:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/content_settings/core/browser/website_settings_registry.h" 5 #include "components/content_settings/core/browser/website_settings_registry.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "components/content_settings/core/common/content_settings.h" 11 #include "components/content_settings/core/common/content_settings.h"
12 12
13 namespace { 13 namespace {
14 14
15 base::LazyInstance<content_settings::WebsiteSettingsRegistry> g_instance = 15 base::LazyInstance<content_settings::WebsiteSettingsRegistry>::DestructorAtExit
16 LAZY_INSTANCE_INITIALIZER; 16 g_instance = LAZY_INSTANCE_INITIALIZER;
17 17
18 } // namespace 18 } // namespace
19 19
20 namespace content_settings { 20 namespace content_settings {
21 21
22 // static 22 // static
23 WebsiteSettingsRegistry* WebsiteSettingsRegistry::GetInstance() { 23 WebsiteSettingsRegistry* WebsiteSettingsRegistry::GetInstance() {
24 return g_instance.Pointer(); 24 return g_instance.Pointer();
25 } 25 }
26 26
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 156 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
157 Register(CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA, 157 Register(CONTENT_SETTINGS_TYPE_PERMISSION_AUTOBLOCKER_DATA,
158 "permission-autoblocking-data", nullptr, 158 "permission-autoblocking-data", nullptr,
159 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY, 159 WebsiteSettingsInfo::UNSYNCABLE, WebsiteSettingsInfo::NOT_LOSSY,
160 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE, 160 WebsiteSettingsInfo::REQUESTING_ORIGIN_ONLY_SCOPE,
161 DESKTOP | PLATFORM_ANDROID, 161 DESKTOP | PLATFORM_ANDROID,
162 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO); 162 WebsiteSettingsInfo::INHERIT_IN_INCOGNITO);
163 } 163 }
164 164
165 } // namespace content_settings 165 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698