Split the Media permission into Camera/Microphone in Origin Info bubble
commit2b2a314fb6c3c2c1a947fa1686e79557503b97f4
authorsashab <sashab@chromium.org>
Sat, 17 Jan 2015 06:42:21 +0000 (16 22:42 -0800)
committerCommit bot <commit-bot@chromium.org>
Sat, 17 Jan 2015 06:43:07 +0000 (17 06:43 +0000)
tree763ef76789f79d91168d502205cf5005d9529e45
parent1348e863d7b7500b3ed954e336fa17668fab7254
Split the Media permission into Camera/Microphone in Origin Info bubble

Split the 'Media' permission into two separate permissions ('Camera' and
'Microphone') in the Origin Info bubble for Android and Desktop. Also
deprecated the _MEDIASTREAM content setting, which was a way of storing
this 'grouped' permission setting.

BUG=433170

Review URL: https://codereview.chromium.org/813183002

Cr-Commit-Position: refs/heads/master@{#312025}
23 files changed:
chrome/android/java/res/drawable-hdpi/permission_mic.png [new file with mode: 0644]
chrome/android/java/res/drawable-mdpi/permission_mic.png [new file with mode: 0644]
chrome/android/java/res/drawable-xhdpi/permission_mic.png [new file with mode: 0644]
chrome/android/java/res/drawable-xxhdpi/permission_mic.png [new file with mode: 0644]
chrome/android/java/res/drawable-xxxhdpi/permission_mic.png [new file with mode: 0644]
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
chrome/app/generated_resources.grd
chrome/app/theme/default_100_percent/common/allowed_camera.png [moved from chrome/app/theme/default_100_percent/ask_media.png with 100% similarity]
chrome/app/theme/default_100_percent/common/allowed_mic.png [new file with mode: 0644]
chrome/app/theme/default_100_percent/common/blocked_camera.png [moved from chrome/app/theme/default_100_percent/common/blocked_mediastream.png with 100% similarity]
chrome/app/theme/default_100_percent/common/blocked_mic.png [new file with mode: 0644]
chrome/app/theme/default_200_percent/common/allowed_camera.png [moved from chrome/app/theme/default_200_percent/ask_media.png with 100% similarity]
chrome/app/theme/default_200_percent/common/allowed_mic.png [new file with mode: 0644]
chrome/app/theme/default_200_percent/common/blocked_camera.png [moved from chrome/app/theme/default_200_percent/common/blocked_mediastream.png with 100% similarity]
chrome/app/theme/default_200_percent/common/blocked_mic.png [new file with mode: 0644]
chrome/app/theme/theme_resources.grd
chrome/browser/ui/android/website_settings_popup_android.cc
chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm
chrome/browser/ui/content_settings/content_setting_image_model.cc
chrome/browser/ui/website_settings/website_settings.cc
chrome/browser/ui/website_settings/website_settings_ui.cc
chrome/browser/ui/website_settings/website_settings_unittest.cc
components/content_settings/core/common/content_settings_types.h