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

Side by Side Diff: chrome/browser/ui/webui/site_settings_helper.cc

Issue 2171503003: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-push-content-setting-2
Patch Set: Remove remaining occurences of CONTENT_SETTINGS_TYPE_PUSH_MESSAGING Created 4 years, 5 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "chrome/browser/ui/webui/site_settings_helper.h" 5 #include "chrome/browser/ui/webui/site_settings_helper.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 24 matching lines...) Expand all
35 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications"}, 35 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications"},
36 {CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, "auto-select-certificate"}, 36 {CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, "auto-select-certificate"},
37 {CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"}, 37 {CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"},
38 {CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"}, 38 {CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"},
39 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"}, 39 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"},
40 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic"}, 40 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic"},
41 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera"}, 41 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera"},
42 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"}, 42 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"},
43 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "multiple-automatic-downloads"}, 43 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "multiple-automatic-downloads"},
44 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex"}, 44 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex"},
45 {CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, "push-messaging"},
46 {CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions"}, 45 {CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions"},
47 #if defined(OS_CHROMEOS) 46 #if defined(OS_CHROMEOS)
48 {CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"}, 47 {CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"},
49 #endif 48 #endif
50 {CONTENT_SETTINGS_TYPE_KEYGEN, "keygen"}, 49 {CONTENT_SETTINGS_TYPE_KEYGEN, "keygen"},
51 {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "background-sync"}, 50 {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "background-sync"},
52 }; 51 };
53 52
54 bool HasRegisteredGroupName(ContentSettingsType type) { 53 bool HasRegisteredGroupName(ContentSettingsType type) {
55 for (size_t i = 0; i < arraysize(kContentSettingsTypeGroupNames); ++i) { 54 for (size_t i = 0; i < arraysize(kContentSettingsTypeGroupNames); ++i) {
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 patterns.begin(), patterns.end(), std::greater<ContentSettingsPattern>()); 226 patterns.begin(), patterns.end(), std::greater<ContentSettingsPattern>());
228 227
229 for (const ContentSettingsPattern& pattern : patterns) { 228 for (const ContentSettingsPattern& pattern : patterns) {
230 exceptions->push_back(GetExceptionForPage(pattern, ContentSettingsPattern(), 229 exceptions->push_back(GetExceptionForPage(pattern, ContentSettingsPattern(),
231 CONTENT_SETTING_ALLOW, 230 CONTENT_SETTING_ALLOW,
232 kPolicyProviderId)); 231 kPolicyProviderId));
233 } 232 }
234 } 233 }
235 234
236 } // namespace site_settings 235 } // namespace site_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698