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

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 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 CONTENT_SETTINGS_TYPE_IMAGES, 528 CONTENT_SETTINGS_TYPE_IMAGES,
529 CONTENT_SETTINGS_TYPE_JAVASCRIPT, 529 CONTENT_SETTINGS_TYPE_JAVASCRIPT,
530 CONTENT_SETTINGS_TYPE_PLUGINS, 530 CONTENT_SETTINGS_TYPE_PLUGINS,
531 CONTENT_SETTINGS_TYPE_POPUPS, 531 CONTENT_SETTINGS_TYPE_POPUPS,
532 CONTENT_SETTINGS_TYPE_GEOLOCATION, 532 CONTENT_SETTINGS_TYPE_GEOLOCATION,
533 CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 533 CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
534 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, 534 CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
535 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, 535 CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
536 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, 536 CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS,
537 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 537 CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
538 CONTENT_SETTINGS_TYPE_KEYGEN,
539 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, 538 CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
540 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, 539 CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA,
541 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT, 540 CONTENT_SETTINGS_TYPE_PROMPT_NO_DECISION_COUNT,
542 }; 541 };
543 542
544 // Create a list to be consistent with existing API, we are expecting a single 543 // Create a list to be consistent with existing API, we are expecting a single
545 // element (or none). 544 // element (or none).
546 std::unique_ptr<base::ListValue> exceptions(new base::ListValue); 545 std::unique_ptr<base::ListValue> exceptions(new base::ListValue);
547 for (size_t type = 0; type < arraysize(kSettingsDetailTypes); ++type) { 546 for (size_t type = 0; type < arraysize(kSettingsDetailTypes); ++type) {
548 ContentSettingsType content_type = kSettingsDetailTypes[type]; 547 ContentSettingsType content_type = kSettingsDetailTypes[type];
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 origin = content::kUnreachableWebDataURL; 708 origin = content::kUnreachableWebDataURL;
710 } 709 }
711 710
712 content::HostZoomMap* host_zoom_map; 711 content::HostZoomMap* host_zoom_map;
713 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_); 712 host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_);
714 double default_level = host_zoom_map->GetDefaultZoomLevel(); 713 double default_level = host_zoom_map->GetDefaultZoomLevel();
715 host_zoom_map->SetZoomLevelForHost(origin, default_level); 714 host_zoom_map->SetZoomLevelForHost(origin, default_level);
716 } 715 }
717 716
718 } // namespace settings 717 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698