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

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

Issue 1432573002: Adding <keygen> Content Setting (Android UI) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@keygen_ui
Patch Set: Fix rebase across multiple ancestors. Created 5 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 "chrome/grit/chromium_strings.h" 7 #include "chrome/grit/chromium_strings.h"
8 #include "chrome/grit/generated_resources.h" 8 #include "chrome/grit/generated_resources.h"
9 #include "components/content_settings/core/browser/plugins_field_trial.h" 9 #include "components/content_settings/core/browser/plugins_field_trial.h"
10 #include "grit/theme_resources.h" 10 #include "grit/theme_resources.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 int allowed_icon_id; 76 int allowed_icon_id;
77 }; 77 };
78 78
79 const PermissionsUIInfo kPermissionsUIInfo[] = { 79 const PermissionsUIInfo kPermissionsUIInfo[] = {
80 {CONTENT_SETTINGS_TYPE_COOKIES, 0, IDR_BLOCKED_COOKIES, 80 {CONTENT_SETTINGS_TYPE_COOKIES, 0, IDR_BLOCKED_COOKIES,
81 IDR_ACCESSED_COOKIES}, 81 IDR_ACCESSED_COOKIES},
82 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_WEBSITE_SETTINGS_TYPE_IMAGES, 82 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_WEBSITE_SETTINGS_TYPE_IMAGES,
83 IDR_BLOCKED_IMAGES, IDR_ALLOWED_IMAGES}, 83 IDR_BLOCKED_IMAGES, IDR_ALLOWED_IMAGES},
84 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT, 84 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_WEBSITE_SETTINGS_TYPE_JAVASCRIPT,
85 IDR_BLOCKED_JAVASCRIPT, IDR_ALLOWED_JAVASCRIPT}, 85 IDR_BLOCKED_JAVASCRIPT, IDR_ALLOWED_JAVASCRIPT},
86 {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_WEBSITE_SETTINGS_TYPE_KEYGEN,
87 IDR_BLOCKED_KEYGEN, IDR_ALLOWED_KEYGEN},
86 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_WEBSITE_SETTINGS_TYPE_POPUPS, 88 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_WEBSITE_SETTINGS_TYPE_POPUPS,
87 IDR_BLOCKED_POPUPS, IDR_ALLOWED_POPUPS}, 89 IDR_BLOCKED_POPUPS, IDR_ALLOWED_POPUPS},
88 #if defined(ENABLE_PLUGINS) 90 #if defined(ENABLE_PLUGINS)
89 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_WEBSITE_SETTINGS_TYPE_PLUGINS, 91 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_WEBSITE_SETTINGS_TYPE_PLUGINS,
90 IDR_BLOCKED_POPUPS, IDR_ALLOWED_PLUGINS}, 92 IDR_BLOCKED_POPUPS, IDR_ALLOWED_PLUGINS},
91 #endif 93 #endif
92 {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_WEBSITE_SETTINGS_TYPE_LOCATION, 94 {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_WEBSITE_SETTINGS_TYPE_LOCATION,
93 IDR_BLOCKED_LOCATION, IDR_ALLOWED_LOCATION}, 95 IDR_BLOCKED_LOCATION, IDR_ALLOWED_LOCATION},
94 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS, 96 {CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
95 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, IDR_BLOCKED_NOTIFICATION, 97 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, IDR_BLOCKED_NOTIFICATION,
96 IDR_ALLOWED_NOTIFICATION}, 98 IDR_ALLOWED_NOTIFICATION},
97 {CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, 99 {CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,
98 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, 0, 0}, 100 IDS_WEBSITE_SETTINGS_TYPE_NOTIFICATIONS, 0, 0},
99 {CONTENT_SETTINGS_TYPE_FULLSCREEN, IDS_WEBSITE_SETTINGS_TYPE_FULLSCREEN, 101 {CONTENT_SETTINGS_TYPE_FULLSCREEN, IDS_WEBSITE_SETTINGS_TYPE_FULLSCREEN,
100 IDR_ALLOWED_FULLSCREEN, IDR_ALLOWED_FULLSCREEN}, 102 IDR_ALLOWED_FULLSCREEN, IDR_ALLOWED_FULLSCREEN},
101 {CONTENT_SETTINGS_TYPE_MOUSELOCK, IDS_WEBSITE_SETTINGS_TYPE_MOUSELOCK, 103 {CONTENT_SETTINGS_TYPE_MOUSELOCK, IDS_WEBSITE_SETTINGS_TYPE_MOUSELOCK,
102 IDR_BLOCKED_MOUSE_CURSOR, IDR_ALLOWED_MOUSE_CURSOR}, 104 IDR_BLOCKED_MOUSE_CURSOR, IDR_ALLOWED_MOUSE_CURSOR},
103 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC, 105 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, IDS_WEBSITE_SETTINGS_TYPE_MIC,
104 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC}, 106 IDR_BLOCKED_MIC, IDR_ALLOWED_MIC},
105 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA, 107 {CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, IDS_WEBSITE_SETTINGS_TYPE_CAMERA,
106 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA}, 108 IDR_BLOCKED_CAMERA, IDR_ALLOWED_CAMERA},
107 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, 109 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS,
108 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS, 110 IDS_AUTOMATIC_DOWNLOADS_TAB_LABEL, IDR_BLOCKED_DOWNLOADS,
109 IDR_ALLOWED_DOWNLOADS}, 111 IDR_ALLOWED_DOWNLOADS},
110 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX, 112 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_WEBSITE_SETTINGS_TYPE_MIDI_SYSEX,
111 IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX}, 113 IDR_BLOCKED_MIDI_SYSEX, IDR_ALLOWED_MIDI_SYSEX},
114 {CONTENT_SETTINGS_TYPE_KEYGEN, IDS_WEBSITE_SETTINGS_TYPE_KEYGEN,
115 IDR_BLOCKED_KEYGEN, IDR_ALLOWED_KEYGEN},
112 }; 116 };
113 117
114 } // namespace 118 } // namespace
115 119
116 WebsiteSettingsUI::CookieInfo::CookieInfo() 120 WebsiteSettingsUI::CookieInfo::CookieInfo()
117 : allowed(-1), blocked(-1) { 121 : allowed(-1), blocked(-1) {
118 } 122 }
119 123
120 WebsiteSettingsUI::PermissionInfo::PermissionInfo() 124 WebsiteSettingsUI::PermissionInfo::PermissionInfo()
121 : type(CONTENT_SETTINGS_TYPE_DEFAULT), 125 : type(CONTENT_SETTINGS_TYPE_DEFAULT),
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 } 338 }
335 return resource_id; 339 return resource_id;
336 } 340 }
337 341
338 // static 342 // static
339 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon( 343 const gfx::Image& WebsiteSettingsUI::GetConnectionIcon(
340 WebsiteSettings::SiteConnectionStatus status) { 344 WebsiteSettings::SiteConnectionStatus status) {
341 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 345 ResourceBundle& rb = ResourceBundle::GetSharedInstance();
342 return rb.GetNativeImageNamed(GetConnectionIconID(status)); 346 return rb.GetNativeImageNamed(GetConnectionIconID(status));
343 } 347 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698