| OLD | NEW |
| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"}, | 65 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"}, |
| 66 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic"}, | 66 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic"}, |
| 67 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera"}, | 67 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera"}, |
| 68 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"}, | 68 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"}, |
| 69 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "multiple-automatic-downloads"}, | 69 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "multiple-automatic-downloads"}, |
| 70 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex"}, | 70 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex"}, |
| 71 {CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions"}, | 71 {CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions"}, |
| 72 #if defined(OS_CHROMEOS) | 72 #if defined(OS_CHROMEOS) |
| 73 {CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"}, | 73 {CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"}, |
| 74 #endif | 74 #endif |
| 75 {CONTENT_SETTINGS_TYPE_KEYGEN, "keygen"}, | |
| 76 {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "background-sync"}, | 75 {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, "background-sync"}, |
| 77 }; | 76 }; |
| 78 | 77 |
| 79 } // namespace | 78 } // namespace |
| 80 | 79 |
| 81 bool HasRegisteredGroupName(ContentSettingsType type) { | 80 bool HasRegisteredGroupName(ContentSettingsType type) { |
| 82 for (size_t i = 0; i < arraysize(kContentSettingsTypeGroupNames); ++i) { | 81 for (size_t i = 0; i < arraysize(kContentSettingsTypeGroupNames); ++i) { |
| 83 if (type == kContentSettingsTypeGroupNames[i].type) | 82 if (type == kContentSettingsTypeGroupNames[i].type) |
| 84 return true; | 83 return true; |
| 85 } | 84 } |
| (...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 452 } | 451 } |
| 453 } | 452 } |
| 454 | 453 |
| 455 for (auto& one_provider_exceptions : all_provider_exceptions) { | 454 for (auto& one_provider_exceptions : all_provider_exceptions) { |
| 456 for (auto& exception : one_provider_exceptions) | 455 for (auto& exception : one_provider_exceptions) |
| 457 exceptions->Append(std::move(exception)); | 456 exceptions->Append(std::move(exception)); |
| 458 } | 457 } |
| 459 } | 458 } |
| 460 | 459 |
| 461 } // namespace site_settings | 460 } // namespace site_settings |
| OLD | NEW |