components/content_settings/core/common/content_settings.cc - Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK.

Side by Side Diff: components/content_settings/core/common/content_settings.cc

Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK. (Closed)

Patch Set: Rebase (a lot of this was already landed). Created 4 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:

« no previous file with comments | « components/content_settings/core/browser/content_settings_registry.cc ('k') | components/content_settings/core/common/content_settings_types.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/common/content_settings.h"	5 #include "components/content_settings/core/common/content_settings.h"

6	6

7 #include "base/containers/hash_tables.h"	7 #include "base/containers/hash_tables.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/macros.h"	9 #include "base/macros.h"

10 #include "base/stl_util.h"	10 #include "base/stl_util.h"

(...skipping 13 matching lines...) Expand all Loading...
24 // content settings type name instead.	24 // content settings type name instead.

25 ContentSettingsType kHistogramOrder[] = {	25 ContentSettingsType kHistogramOrder[] = {

26 CONTENT_SETTINGS_TYPE_COOKIES,	26 CONTENT_SETTINGS_TYPE_COOKIES,

27 CONTENT_SETTINGS_TYPE_IMAGES,	27 CONTENT_SETTINGS_TYPE_IMAGES,

28 CONTENT_SETTINGS_TYPE_JAVASCRIPT,	28 CONTENT_SETTINGS_TYPE_JAVASCRIPT,

29 CONTENT_SETTINGS_TYPE_PLUGINS,	29 CONTENT_SETTINGS_TYPE_PLUGINS,

30 CONTENT_SETTINGS_TYPE_POPUPS,	30 CONTENT_SETTINGS_TYPE_POPUPS,

31 CONTENT_SETTINGS_TYPE_GEOLOCATION,	31 CONTENT_SETTINGS_TYPE_GEOLOCATION,

32 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,	32 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,

33 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,	33 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,

34 CONTENT_SETTINGS_TYPE_FULLSCREEN,

35 CONTENT_SETTINGS_TYPE_MOUSELOCK,
raymes 2016/11/06 23:50:12 Please replace these with CONTENT_SETTINGS_TYPE_DE Please replace these with CONTENT_SETTINGS_TYPE_DEFAULT so that the histogram order stays correct (see e.g. MEDIASTREAM below) Matt Giuca 2016/11/07 00:38:48 Done. Sorry I didn't spot this. Show quoted text On 2016/11/06 23:50:12, raymes wrote: > Please replace these with CONTENT_SETTINGS_TYPE_DEFAULT so that the histogram > order stays correct (see e.g. MEDIASTREAM below) Done. Sorry I didn't spot this.
36 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,	34 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,

37 CONTENT_SETTINGS_TYPE_DEFAULT, // MEDIASTREAM (removed).	35 CONTENT_SETTINGS_TYPE_DEFAULT, // MEDIASTREAM (removed).

38 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,	36 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,

39 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,	37 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,

40 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,	38 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,

41 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,	39 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,

42 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,	40 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,

43 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,	41 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,

44 CONTENT_SETTINGS_TYPE_DEFAULT, // PUSH_MESSAGING (removed).	42 CONTENT_SETTINGS_TYPE_DEFAULT, // PUSH_MESSAGING (removed).

45 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,	43 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,

(...skipping 46 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92 ContentSettingPatternSource::ContentSettingPatternSource()	90 ContentSettingPatternSource::ContentSettingPatternSource()

93 : setting(CONTENT_SETTING_DEFAULT), incognito(false) {	91 : setting(CONTENT_SETTING_DEFAULT), incognito(false) {

94 }	92 }

95	93

96 ContentSettingPatternSource::ContentSettingPatternSource(	94 ContentSettingPatternSource::ContentSettingPatternSource(

97 const ContentSettingPatternSource& other) = default;	95 const ContentSettingPatternSource& other) = default;

98	96

99 RendererContentSettingRules::RendererContentSettingRules() {}	97 RendererContentSettingRules::RendererContentSettingRules() {}

100	98

101 RendererContentSettingRules::~RendererContentSettingRules() {}	99 RendererContentSettingRules::~RendererContentSettingRules() {}

OLD	NEW