| OLD | NEW |
| 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/content_settings/content_setting_bubble_model.h" | 5 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 SetTitle(); | 96 SetTitle(); |
| 97 SetManageLink(); | 97 SetManageLink(); |
| 98 SetLearnMoreLink(); | 98 SetLearnMoreLink(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 void ContentSettingTitleAndLinkModel::SetTitle() { | 101 void ContentSettingTitleAndLinkModel::SetTitle() { |
| 102 static const ContentSettingsTypeIdEntry kBlockedTitleIDs[] = { | 102 static const ContentSettingsTypeIdEntry kBlockedTitleIDs[] = { |
| 103 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE}, | 103 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE}, |
| 104 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_TITLE}, | 104 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_TITLE}, |
| 105 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_TITLE}, | 105 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_TITLE}, |
| 106 {CONTENT_SETTINGS_TYPE_MEDIA, IDS_BLOCKED_MEDIA_TITLE}, |
| 106 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_MESSAGE}, | 107 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_MESSAGE}, |
| 107 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_TITLE}, | 108 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_TITLE}, |
| 108 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, | 109 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, |
| 109 IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT}, | 110 IDS_BLOCKED_DISPLAYING_INSECURE_CONTENT}, |
| 110 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, | 111 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, |
| 111 IDS_BLOCKED_PPAPI_BROKER_TITLE}, | 112 IDS_BLOCKED_PPAPI_BROKER_TITLE}, |
| 112 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_TITLE}, | 113 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_TITLE}, |
| 113 }; | 114 }; |
| 114 // Fields as for kBlockedTitleIDs, above. | 115 // Fields as for kBlockedTitleIDs, above. |
| 115 static const ContentSettingsTypeIdEntry kAccessedTitleIDs[] = { | 116 static const ContentSettingsTypeIdEntry kAccessedTitleIDs[] = { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 131 GetIdForContentType(title_ids, num_title_ids, content_type()); | 132 GetIdForContentType(title_ids, num_title_ids, content_type()); |
| 132 if (title_id) | 133 if (title_id) |
| 133 set_title(l10n_util::GetStringUTF8(title_id)); | 134 set_title(l10n_util::GetStringUTF8(title_id)); |
| 134 } | 135 } |
| 135 | 136 |
| 136 void ContentSettingTitleAndLinkModel::SetManageLink() { | 137 void ContentSettingTitleAndLinkModel::SetManageLink() { |
| 137 static const ContentSettingsTypeIdEntry kLinkIDs[] = { | 138 static const ContentSettingsTypeIdEntry kLinkIDs[] = { |
| 138 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_LINK}, | 139 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_LINK}, |
| 139 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_LINK}, | 140 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_LINK}, |
| 140 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_LINK}, | 141 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_LINK}, |
| 142 {CONTENT_SETTINGS_TYPE_MEDIA, IDS_BLOCKED_MEDIA_LINK}, |
| 141 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_LINK}, | 143 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_LINK}, |
| 142 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_LINK}, | 144 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_LINK}, |
| 143 {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_GEOLOCATION_BUBBLE_MANAGE_LINK}, | 145 {CONTENT_SETTINGS_TYPE_GEOLOCATION, IDS_GEOLOCATION_BUBBLE_MANAGE_LINK}, |
| 144 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDS_LEARN_MORE}, | 146 {CONTENT_SETTINGS_TYPE_MIXEDSCRIPT, IDS_LEARN_MORE}, |
| 145 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, IDS_HANDLERS_BUBBLE_MANAGE_LINK}, | 147 {CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS, IDS_HANDLERS_BUBBLE_MANAGE_LINK}, |
| 146 {CONTENT_SETTINGS_TYPE_MEDIASTREAM, IDS_MEDIASTREAM_BUBBLE_MANAGE_LINK}, | 148 {CONTENT_SETTINGS_TYPE_MEDIASTREAM, IDS_MEDIASTREAM_BUBBLE_MANAGE_LINK}, |
| 147 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_PPAPI_BROKER_BUBBLE_MANAGE_LINK}, | 149 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_PPAPI_BROKER_BUBBLE_MANAGE_LINK}, |
| 148 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOADS_LINK}, | 150 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOADS_LINK}, |
| 149 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_MIDI_SYSEX_BUBBLE_MANAGE_LINK}, | 151 {CONTENT_SETTINGS_TYPE_MIDI_SYSEX, IDS_MIDI_SYSEX_BUBBLE_MANAGE_LINK}, |
| 150 }; | 152 }; |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 277 DCHECK(!allowed || | 279 DCHECK(!allowed || |
| 278 content_settings->IsContentAllowed(content_type())); | 280 content_settings->IsContentAllowed(content_type())); |
| 279 | 281 |
| 280 RadioGroup radio_group; | 282 RadioGroup radio_group; |
| 281 radio_group.url = url; | 283 radio_group.url = url; |
| 282 | 284 |
| 283 static const ContentSettingsTypeIdEntry kBlockedAllowIDs[] = { | 285 static const ContentSettingsTypeIdEntry kBlockedAllowIDs[] = { |
| 284 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_UNBLOCK}, | 286 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_UNBLOCK}, |
| 285 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_UNBLOCK}, | 287 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_UNBLOCK}, |
| 286 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_UNBLOCK}, | 288 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_UNBLOCK}, |
| 289 {CONTENT_SETTINGS_TYPE_MEDIA, IDS_BLOCKED_MEDIA_UNBLOCK}, |
| 287 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_UNBLOCK_ALL}, | 290 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_UNBLOCK_ALL}, |
| 288 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_UNBLOCK}, | 291 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_UNBLOCK}, |
| 289 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_UNBLOCK}, | 292 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_UNBLOCK}, |
| 290 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_UNBLOCK}, | 293 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_UNBLOCK}, |
| 291 }; | 294 }; |
| 292 // Fields as for kBlockedAllowIDs, above. | 295 // Fields as for kBlockedAllowIDs, above. |
| 293 static const ContentSettingsTypeIdEntry kAllowedAllowIDs[] = { | 296 static const ContentSettingsTypeIdEntry kAllowedAllowIDs[] = { |
| 294 // TODO(bauerb): The string shouldn't be "unblock" (they weren't blocked). | 297 // TODO(bauerb): The string shouldn't be "unblock" (they weren't blocked). |
| 295 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_UNBLOCK}, | 298 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_UNBLOCK}, |
| 296 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_NO_ACTION}, | 299 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_NO_ACTION}, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 309 radio_allow_label = l10n_util::GetStringFUTF8( | 312 radio_allow_label = l10n_util::GetStringFUTF8( |
| 310 GetIdForContentType(kBlockedAllowIDs, arraysize(kBlockedAllowIDs), | 313 GetIdForContentType(kBlockedAllowIDs, arraysize(kBlockedAllowIDs), |
| 311 content_type()), | 314 content_type()), |
| 312 display_host); | 315 display_host); |
| 313 } | 316 } |
| 314 | 317 |
| 315 static const ContentSettingsTypeIdEntry kBlockedBlockIDs[] = { | 318 static const ContentSettingsTypeIdEntry kBlockedBlockIDs[] = { |
| 316 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_NO_ACTION}, | 319 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_NO_ACTION}, |
| 317 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_NO_ACTION}, | 320 {CONTENT_SETTINGS_TYPE_IMAGES, IDS_BLOCKED_IMAGES_NO_ACTION}, |
| 318 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_NO_ACTION}, | 321 {CONTENT_SETTINGS_TYPE_JAVASCRIPT, IDS_BLOCKED_JAVASCRIPT_NO_ACTION}, |
| 322 {CONTENT_SETTINGS_TYPE_MEDIA, IDS_BLOCKED_MEDIA_NO_ACTION}, |
| 319 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_NO_ACTION}, | 323 {CONTENT_SETTINGS_TYPE_PLUGINS, IDS_BLOCKED_PLUGINS_NO_ACTION}, |
| 320 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_NO_ACTION}, | 324 {CONTENT_SETTINGS_TYPE_POPUPS, IDS_BLOCKED_POPUPS_NO_ACTION}, |
| 321 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_NO_ACTION}, | 325 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_BLOCKED_PPAPI_BROKER_NO_ACTION}, |
| 322 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_NO_ACTION}, | 326 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_BLOCKED_DOWNLOAD_NO_ACTION}, |
| 323 }; | 327 }; |
| 324 static const ContentSettingsTypeIdEntry kAllowedBlockIDs[] = { | 328 static const ContentSettingsTypeIdEntry kAllowedBlockIDs[] = { |
| 325 // TODO(bauerb): The string should say "block". | 329 // TODO(bauerb): The string should say "block". |
| 326 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_NO_ACTION}, | 330 {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_NO_ACTION}, |
| 327 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_BLOCK}, | 331 {CONTENT_SETTINGS_TYPE_PPAPI_BROKER, IDS_ALLOWED_PPAPI_BROKER_BLOCK}, |
| 328 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_ALLOWED_DOWNLOAD_BLOCK}, | 332 {CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, IDS_ALLOWED_DOWNLOAD_BLOCK}, |
| (...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1323 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) { | 1327 if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) { |
| 1324 DCHECK_EQ(web_contents_, | 1328 DCHECK_EQ(web_contents_, |
| 1325 content::Source<WebContents>(source).ptr()); | 1329 content::Source<WebContents>(source).ptr()); |
| 1326 web_contents_ = NULL; | 1330 web_contents_ = NULL; |
| 1327 } else { | 1331 } else { |
| 1328 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type); | 1332 DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type); |
| 1329 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr()); | 1333 DCHECK_EQ(profile_, content::Source<Profile>(source).ptr()); |
| 1330 profile_ = NULL; | 1334 profile_ = NULL; |
| 1331 } | 1335 } |
| 1332 } | 1336 } |
| OLD | NEW |