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

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

Issue 2419413002: Deleted CONTENT_SETTINGS_TYPE_FULLSCREEN and MOUSELOCK. (Closed)
Patch Set: Fix more things. 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:
View unified diff | Download patch
OLDNEW
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
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, 34 CONTENT_SETTINGS_TYPE_DEFAULT, // FULLSCREEN (removed).
35 CONTENT_SETTINGS_TYPE_MOUSELOCK, 35 CONTENT_SETTINGS_TYPE_DEFAULT, // MOUSELOCK (removed).
36 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, 36 CONTENT_SETTINGS_TYPE_MIXEDSCRIPT,
37 CONTENT_SETTINGS_TYPE_DEFAULT, // MEDIASTREAM (removed). 37 CONTENT_SETTINGS_TYPE_DEFAULT, // MEDIASTREAM (removed).
38 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, 38 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
39 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, 39 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
40 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, 40 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,
41 CONTENT_SETTINGS_TYPE_PPAPI_BROKER, 41 CONTENT_SETTINGS_TYPE_PPAPI_BROKER,
42 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 42 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
43 CONTENT_SETTINGS_TYPE_MIDI_SYSEX, 43 CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
44 CONTENT_SETTINGS_TYPE_DEFAULT, // PUSH_MESSAGING (removed). 44 CONTENT_SETTINGS_TYPE_DEFAULT, // PUSH_MESSAGING (removed).
45 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, 45 CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS,
46 CONTENT_SETTINGS_TYPE_DEFAULT, // METRO_SWITCH_TO_DESKTOP (deprecated). 46 CONTENT_SETTINGS_TYPE_DEFAULT, // METRO_SWITCH_TO_DESKTOP (removed).
47 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 47 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
48 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, 48 CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
49 #else 49 #else
50 CONTENT_SETTINGS_TYPE_DEFAULT, // PROTECTED_MEDIA_IDENTIFIER (mobile only). 50 CONTENT_SETTINGS_TYPE_DEFAULT, // PROTECTED_MEDIA_IDENTIFIER (mobile only).
51 #endif 51 #endif
52 CONTENT_SETTINGS_TYPE_APP_BANNER, 52 CONTENT_SETTINGS_TYPE_APP_BANNER,
53 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, 53 CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
54 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE, 54 CONTENT_SETTINGS_TYPE_DURABLE_STORAGE,
55 CONTENT_SETTINGS_TYPE_KEYGEN, 55 CONTENT_SETTINGS_TYPE_KEYGEN,
56 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD, 56 CONTENT_SETTINGS_TYPE_BLUETOOTH_GUARD,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 ContentSettingPatternSource::ContentSettingPatternSource() 92 ContentSettingPatternSource::ContentSettingPatternSource()
93 : setting(CONTENT_SETTING_DEFAULT), incognito(false) { 93 : setting(CONTENT_SETTING_DEFAULT), incognito(false) {
94 } 94 }
95 95
96 ContentSettingPatternSource::ContentSettingPatternSource( 96 ContentSettingPatternSource::ContentSettingPatternSource(
97 const ContentSettingPatternSource& other) = default; 97 const ContentSettingPatternSource& other) = default;
98 98
99 RendererContentSettingRules::RendererContentSettingRules() {} 99 RendererContentSettingRules::RendererContentSettingRules() {}
100 100
101 RendererContentSettingRules::~RendererContentSettingRules() {} 101 RendererContentSettingRules::~RendererContentSettingRules() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698