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

Unified Diff: chrome/browser/android/preferences/pref_service_bridge.cc

Issue 2006023005: Disable fullscreen global permission setting in Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2743
Patch Set: Created 4 years, 7 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/preferences/pref_service_bridge.cc
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index d4bc0a8b85a4041b7aff7dabbe620dadcb12588f..aa002843bcdcdff844ea64a4e370e1c549ee7d58 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -15,6 +15,7 @@
#include "base/android/jni_array.h"
#include "base/android/jni_string.h"
#include "base/android/jni_weak_ref.h"
+#include "base/feature_list.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/metrics/histogram_macros.h"
@@ -37,6 +38,7 @@
#include "chrome/browser/sync/profile_sync_service_factory.h"
#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/ui/android/android_about_app_info.h"
+#include "chrome/common/chrome_features.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/locale_settings.h"
#include "components/browsing_data_ui/history_notice_utils.h"
@@ -447,6 +449,12 @@ static jboolean GetFullscreenManaged(JNIEnv* env,
static jboolean GetFullscreenAllowed(JNIEnv* env,
const JavaParamRef<jobject>& obj) {
+ // In the simplified fullscreen case, fullscreen is always allowed.
+ // TODO(mgiuca): Remove this pref once all data associated with it is deleted
+ // (https://crbug.com/591896).
+ if (base::FeatureList::IsEnabled(features::kSimplifiedFullscreenUI))
+ return true;
+
HostContentSettingsMap* content_settings =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
return content_settings->GetDefaultContentSetting(
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698