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

Side by Side Diff: chrome/browser/ui/webui/settings/site_settings_handler.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/settings/site_settings_handler.h" 5 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 514 matching lines...) Expand 10 before | Expand all | Expand 10 after
525 CONTENT_SETTINGS_TYPE_IMAGES, 525 CONTENT_SETTINGS_TYPE_IMAGES,
526 CONTENT_SETTINGS_TYPE_JAVASCRIPT, 526 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
527 CONTENT_SETTINGS_TYPE_PLUGINS, 527 CONTENT_SETTINGS_TYPE_PLUGINS,
528 CONTENT_SETTINGS_TYPE_POPUPS, 528 CONTENT_SETTINGS_TYPE_POPUPS,
529 CONTENT_SETTINGS_TYPE_GEOLOCATION, 529 CONTENT_SETTINGS_TYPE_GEOLOCATION,
530 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 530 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
531 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, 531 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
532 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, 532 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
533 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, 533 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,
534 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 534 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
535 CONTENT_SETTINGS_TYPE_KEYGEN,
536 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, 535 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
537 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, 536 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,
538 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, 537 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
539 }; 538 };
540 539
541 // Create a list to be consistent with existing API, we are expecting a single 540 // Create a list to be consistent with existing API, we are expecting a single
542 // element (or none). 541 // element (or none).
543 std::unique_ptr<base::ListValue> exceptions(new base::ListValue); 542 std::unique_ptr<base::ListValue> exceptions(new base::ListValue);
544 for (size_t type = 0; type < arraysize(kSettingsDetailTypes); ++type) { 543 for (size_t type = 0; type < arraysize(kSettingsDetailTypes); ++type) {
545 ContentSettingsType content_type = kSettingsDetailTypes[type]; 544 ContentSettingsType content_type = kSettingsDetailTypes[type];
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 origin = content::kUnreachableWebDataURL; 687 origin = content::kUnreachableWebDataURL;
689 } 688 }
690 689
691 content::HostZoomMap* host_zoom_map; 690 content::HostZoomMap* host_zoom_map;
692 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_); 691 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_);
693 double default_level = host_zoom_map->GetDefaultZoomLevel(); 692 double default_level = host_zoom_map->GetDefaultZoomLevel();
694 host_zoom_map->SetZoomLevelForHost(origin, default_level); 693 host_zoom_map->SetZoomLevelForHost(origin, default_level);
695 } 694 }
696 695
697 } // namespace settings 696 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698