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

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

Issue 2536993002: Remove support for the keygen tag (Closed)
Patch Set: Rebased Created 4 years 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 <functional> 7 #include <functional>
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"}, 62 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"},
63 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic"}, 63 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic"},
64 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera"}, 64 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera"},
65 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"}, 65 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"},
66 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "multiple-automatic-downloads"}, 66 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "multiple-automatic-downloads"},
67 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex"}, 67 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex"},
68 {CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions"}, 68 {CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions"},
69 #if defined(OS_CHROMEOS) 69 #if defined(OS_CHROMEOS)
70 {CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"}, 70 {CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"},
71 #endif 71 #endif
72 {CONTENT_SETTINGS_TYPE_KEYGEN, "keygen"},
73 {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "background-sync"}, 72 {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "background-sync"},
74 }; 73 };
75 74
76 } // namespace 75 } // namespace
77 76
78 bool HasRegisteredGroupName(ContentSettingsType type) { 77 bool HasRegisteredGroupName(ContentSettingsType type) {
79 for (size_t i = 0; i < arraysize(kContentSettingsTypeGroupNames); ++i) { 78 for (size_t i = 0; i < arraysize(kContentSettingsTypeGroupNames); ++i) {
80 if (type == kContentSettingsTypeGroupNames[i].type) 79 if (type == kContentSettingsTypeGroupNames[i].type)
81 return true; 80 return true;
82 } 81 }
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 } 406 }
408 } 407 }
409 408
410 for (auto& one_provider_exceptions : all_provider_exceptions) { 409 for (auto& one_provider_exceptions : all_provider_exceptions) {
411 for (auto& exception : one_provider_exceptions) 410 for (auto& exception : one_provider_exceptions)
412 exceptions->Append(std::move(exception)); 411 exceptions->Append(std::move(exception));
413 } 412 }
414 } 413 }
415 414
416 } // namespace site_settings 415 } // namespace site_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698