Split Camera and Mic into two permissions on the Site Details page (under Site Settings).
commitb2280c4e66b154c89b918befba3b07a1b3e84ec3
authorfinnur <finnur@chromium.org>
Mon, 27 Apr 2015 13:09:01 +0000 (27 06:09 -0700)
committerCommit bot <commit-bot@chromium.org>
Mon, 27 Apr 2015 13:09:07 +0000 (27 13:09 +0000)
treece2e48beae42d8301412e38ea0e2d4a92b5f05a3
parenta685c0fb434f2eb0908b0d443ed27a84daa89e6c
Split Camera and Mic into two permissions on the Site Details page (under Site Settings).

BUG=477678

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

Cr-Commit-Position: refs/heads/master@{#327032}
27 files changed:
chrome/android/java/res/drawable-hdpi/permission_camera.png [moved from chrome/android/java/res/drawable-hdpi/permission_media.png with 100% similarity]
chrome/android/java/res/drawable-mdpi/permission_camera.png [moved from chrome/android/java/res/drawable-mdpi/permission_media.png with 100% similarity]
chrome/android/java/res/drawable-xhdpi/permission_camera.png [moved from chrome/android/java/res/drawable-xhdpi/permission_media.png with 100% similarity]
chrome/android/java/res/drawable-xxhdpi/permission_camera.png [moved from chrome/android/java/res/drawable-xxhdpi/permission_media.png with 100% similarity]
chrome/android/java/res/drawable-xxxhdpi/permission_camera.png [moved from chrome/android/java/res/drawable-xxxhdpi/permission_media.png with 100% similarity]
chrome/android/java/res/drawable/website_voice_and_video_capture.xml [deleted file]
chrome/android/java/res/layout/website_features.xml
chrome/android/java/res/xml/content_preferences.xml
chrome/android/java/res/xml/single_website_preferences.xml
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/CameraInfo.java [new file with mode: 0644]
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentPreferences.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingsResources.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/MicrophoneInfo.java [new file with mode: 0644]
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/VoiceAndVideoCaptureInfo.java [deleted file]
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/Website.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePermissionsFetcher.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreference.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferences.java
chrome/android/java/src/org/chromium/chrome/browser/preferences/website/WebsiteSettingsCategoryFilter.java
chrome/android/java/strings/android_chrome_strings.grd
chrome/android/javatests/src/org/chromium/chrome/browser/preferences/website/ContentPreferencesTest.java
chrome/browser/android/preferences/pref_service_bridge.cc
chrome/browser/android/preferences/website_preference_bridge.cc