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

Side by Side Diff: chrome/browser/ui/webui/site_settings_helper.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 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { 53 const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = {
54 {CONTENT_SETTINGS_TYPE_COOKIES, "cookies"}, 54 {CONTENT_SETTINGS_TYPE_COOKIES, "cookies"},
55 {CONTENT_SETTINGS_TYPE_IMAGES, "images"}, 55 {CONTENT_SETTINGS_TYPE_IMAGES, "images"},
56 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript"}, 56 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, "javascript"},
57 {CONTENT_SETTINGS_TYPE_PLUGINS, "plugins"}, 57 {CONTENT_SETTINGS_TYPE_PLUGINS, "plugins"},
58 {CONTENT_SETTINGS_TYPE_POPUPS, "popups"}, 58 {CONTENT_SETTINGS_TYPE_POPUPS, "popups"},
59 {CONTENT_SETTINGS_TYPE_GEOLOCATION, "location"}, 59 {CONTENT_SETTINGS_TYPE_GEOLOCATION, "location"},
60 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications"}, 60 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, "notifications"},
61 {CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, "auto-select-certificate"}, 61 {CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, "auto-select-certificate"},
62 {CONTENT_SETTINGS_TYPE_FULLSCREEN, "fullscreen"},
63 {CONTENT_SETTINGS_TYPE_MOUSELOCK, "mouselock"},
64 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"}, 62 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, "register-protocol-handler"},
65 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic"}, 63 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, "media-stream-mic"},
66 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera"}, 64 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, "media-stream-camera"},
67 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"}, 65 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, "ppapi-broker"},
68 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "multiple-automatic-downloads"}, 66 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, "multiple-automatic-downloads"},
69 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex"}, 67 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, "midi-sysex"},
70 {CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions"}, 68 {CONTENT_SETTINGS_TYPE_SSL_CERT_DECISIONS, "ssl-cert-decisions"},
71 #if defined(OS_CHROMEOS) 69 #if defined(OS_CHROMEOS)
72 {CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"}, 70 {CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER, "protectedContent"},
73 #endif 71 #endif
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 } 407 }
410 } 408 }
411 409
412 for (auto& one_provider_exceptions : all_provider_exceptions) { 410 for (auto& one_provider_exceptions : all_provider_exceptions) {
413 for (auto& exception : one_provider_exceptions) 411 for (auto& exception : one_provider_exceptions)
414 exceptions->Append(std::move(exception)); 412 exceptions->Append(std::move(exception));
415 } 413 }
416 } 414 }
417 415
418 } // namespace site_settings 416 } // namespace site_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698