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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings_ui.cc

Issue 1412523003: Adding <keygen> Content Setting (UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Using new Keygen icons. Created 4 years, 11 months 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/grit/chromium_strings.h" 8 #include "chrome/grit/chromium_strings.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "components/content_settings/core/browser/plugins_field_trial.h" 10 #include "components/content_settings/core/browser/plugins_field_trial.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 IDR_BLOCKED_MOUSE_CURSOR, IDR_ALLOWED_MOUSE_CURSOR}, 103 IDR_BLOCKED_MOUSE_CURSOR, IDR_ALLOWED_MOUSE_CURSOR},
104 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC, 104 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC,
105 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC}, 105 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC},
106 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA, 106 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA,
107 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA}, 107 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA},
108 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 108 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
109 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS, 109 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS,
110 IDR_ALLOWED_DOWNLOADS}, 110 IDR_ALLOWED_DOWNLOADS},
111 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX, 111 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX,
112 IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX}, 112 IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX},
113 {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_WEBSITE_SETTINGS_TYPE_KEYGEN,
114 IDR_BLOCKED_KEYGEN, IDR_ALLOWED_KEYGEN},
113 }; 115 };
114 116
115 } // namespace 117 } // namespace
116 118
117 WebsiteSettingsUI::CookieInfo::CookieInfo() 119 WebsiteSettingsUI::CookieInfo::CookieInfo()
118 : allowed(-1), blocked(-1) { 120 : allowed(-1), blocked(-1) {
119 } 121 }
120 122
121 WebsiteSettingsUI::PermissionInfo::PermissionInfo() 123 WebsiteSettingsUI::PermissionInfo::PermissionInfo()
122 : type(CONTENT_SETTINGS_TYPE_DEFAULT), 124 : type(CONTENT_SETTINGS_TYPE_DEFAULT),
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 } 337 }
336 return resource_id; 338 return resource_id;
337 } 339 }
338 340
339 // static 341 // static
340 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 342 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
341 WebsiteSettings::SiteConnectionStatus status) { 343 WebsiteSettings::SiteConnectionStatus status) {
342 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 344 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
343 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 345 return rb.GetNativeImageNamed(GetConnectionIconID(status));
344 } 346 }
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