summaryrefslogtreecommitdiffstats
path: root/chrome/browser/android/preferences/pref_service_bridge_unittest.cc
diff options
context:
space:
mode:
authortedchoc <tedchoc@chromium.org>2015-07-09 17:37:11 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-10 00:38:57 +0000
commitc1718be56c02a72f56ed3d48ed4fa9b281309c3a (patch)
tree2bbbed4a1e40007092377349e98b98ce98dfdbb8 /chrome/browser/android/preferences/pref_service_bridge_unittest.cc
parent023b812c3d1460d7791de52adff70c7c48f51e5a (diff)
downloadchromium_src-c1718be56c02a72f56ed3d48ed4fa9b281309c3a.zip
chromium_src-c1718be56c02a72f56ed3d48ed4fa9b281309c3a.tar.gz
chromium_src-c1718be56c02a72f56ed3d48ed4fa9b281309c3a.tar.bz2
Do not show media infobars on Android if permissions prevent them.
In Android M, camera and audio are runtime permissions that can potentially be in a state where chrome can no longer request them to be granted. In particular, the user could have denied the permission several times and selected "Never ask again". If Chrome has no way to request the permission, we should not show an infobar that puts chrome in an odd state (i.e. the website has permission, but chrome itself does not). Adds the ability to check android permissions from native. BUG=508331 Review URL: https://codereview.chromium.org/1227873002 Cr-Commit-Position: refs/heads/master@{#338200}
Diffstat (limited to 'chrome/browser/android/preferences/pref_service_bridge_unittest.cc')
-rw-r--r--chrome/browser/android/preferences/pref_service_bridge_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/android/preferences/pref_service_bridge_unittest.cc b/chrome/browser/android/preferences/pref_service_bridge_unittest.cc
index e73e7ee..c73a998 100644
--- a/chrome/browser/android/preferences/pref_service_bridge_unittest.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge_unittest.cc
@@ -14,7 +14,8 @@ class PrefServiceBridgeTest : public testing::Test {
public:
std::string GetAcceptLanguages(std::string locale,
std::string accept_languages) {
- PrependToAcceptLanguagesIfNecessary(locale, &accept_languages);
+ PrefServiceBridge::PrependToAcceptLanguagesIfNecessary(locale,
+ &accept_languages);
return accept_languages;
}
};