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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/website_settings/website_settings_ui.h" 5 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 8 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
9 #include "chrome/browser/plugins/plugin_utils.h" 9 #include "chrome/browser/plugins/plugin_utils.h"
10 #include "chrome/browser/plugins/plugins_field_trial.h" 10 #include "chrome/browser/plugins/plugins_field_trial.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 IDR_ALLOWED_NOTIFICATION}, 102 IDR_ALLOWED_NOTIFICATION},
103 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC, 103 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC,
104 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC}, 104 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC},
105 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA, 105 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA,
106 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA}, 106 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA},
107 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 107 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
108 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS, 108 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS,
109 IDR_ALLOWED_DOWNLOADS}, 109 IDR_ALLOWED_DOWNLOADS},
110 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX, 110 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX,
111 IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX}, 111 IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX},
112 {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_WEBSITE_SETTINGS_TYPE_KEYGEN,
113 IDR_BLOCKED_KEYGEN, IDR_ALLOWED_KEYGEN},
114 {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC, 112 {CONTENT_SETTINGS_TYPE_BACKGROUND_SYNC,
115 IDS_WEBSITE_SETTINGS_TYPE_BACKGROUND_SYNC, IDR_BLOCKED_BACKGROUND_SYNC, 113 IDS_WEBSITE_SETTINGS_TYPE_BACKGROUND_SYNC, IDR_BLOCKED_BACKGROUND_SYNC,
116 IDR_ALLOWED_BACKGROUND_SYNC}, 114 IDR_ALLOWED_BACKGROUND_SYNC},
117 // Autoplay is Android-only at the moment, and the Origin Info bubble in 115 // Autoplay is Android-only at the moment, and the Origin Info bubble in
118 // Android ignores these block/allow icon pairs, so we can specify 0 there. 116 // Android ignores these block/allow icon pairs, so we can specify 0 there.
119 {CONTENT_SETTINGS_TYPE_AUTOPLAY, IDS_WEBSITE_SETTINGS_TYPE_AUTOPLAY, 0, 0}, 117 {CONTENT_SETTINGS_TYPE_AUTOPLAY, IDS_WEBSITE_SETTINGS_TYPE_AUTOPLAY, 0, 0},
120 }; 118 };
121 119
122 std::unique_ptr<WebsiteSettingsUI::SecurityDescription> 120 std::unique_ptr<WebsiteSettingsUI::SecurityDescription>
123 CreateSecurityDescription(int summary_id, int details_id) { 121 CreateSecurityDescription(int summary_id, int details_id) {
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 } 394 }
397 return resource_id; 395 return resource_id;
398 } 396 }
399 397
400 // static 398 // static
401 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 399 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
402 WebsiteSettings::SiteConnectionStatus status) { 400 WebsiteSettings::SiteConnectionStatus status) {
403 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 401 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
404 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 402 return rb.GetNativeImageNamed(GetConnectionIconID(status));
405 } 403 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698