no changes
This commit is contained in:
@@ -11,7 +11,7 @@ Subject: 109 ADDTO Disable safe browsing
|
||||
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
|
||||
@@ -117,6 +117,7 @@ const char kPathKey[] = "path";
|
||||
@@ -115,6 +115,7 @@ const char kPathKey[] = "path";
|
||||
const char kPathTypeKey[] = "path-type";
|
||||
const char kTimestampKey[] = "timestamp";
|
||||
|
||||
@@ -19,7 +19,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
|
||||
void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
|
||||
content::GlobalRenderFrameHostId frame_id,
|
||||
const url::Origin& origin,
|
||||
@@ -146,7 +147,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
|
||||
@@ -144,7 +145,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
|
||||
origin, handle_type, std::move(callback), web_contents);
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
|
||||
void ShowFileSystemAccessDangerousFileDialogOnUIThread(
|
||||
content::GlobalRenderFrameHostId frame_id,
|
||||
const url::Origin& origin,
|
||||
@@ -488,6 +488,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
|
||||
@@ -437,6 +437,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
|
||||
: kPermissionReadableKey;
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
|
||||
bool FileHasDangerousExtension(const url::Origin& origin,
|
||||
const base::FilePath& path,
|
||||
Profile* profile) {
|
||||
@@ -499,6 +500,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
|
||||
@@ -448,6 +449,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
|
||||
return danger_level == safe_browsing::DownloadFileType::DANGEROUS ||
|
||||
danger_level == safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE;
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1181,8 +1184,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
|
||||
@@ -1184,8 +1187,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
|
||||
infoText.setSummary(R.string.website_settings_cookie_info);
|
||||
} else if (mCategory.getType() == SiteSettingsCategory.Type.IMAGES) {
|
||||
allowSpecifyingExceptions = true;
|
||||
|
||||
@@ -19,7 +19,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1176,8 +1179,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
|
||||
@@ -1179,8 +1182,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
|
||||
Preference infoText = screen.findPreference(INFO_TEXT_KEY);
|
||||
if (mCategory.getType() == SiteSettingsCategory.Type.COOKIES) {
|
||||
infoText.setSummary(R.string.website_settings_cookie_info);
|
||||
|
||||
@@ -19,7 +19,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
|
||||
case SiteSettingsCategory.Type.JAVASCRIPT_JIT:
|
||||
allowSpecifyingExceptions = true;
|
||||
break;
|
||||
@@ -1182,8 +1185,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
|
||||
@@ -1185,8 +1188,6 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
|
||||
Preference infoText = screen.findPreference(INFO_TEXT_KEY);
|
||||
if (mCategory.getType() == SiteSettingsCategory.Type.COOKIES) {
|
||||
infoText.setSummary(R.string.website_settings_cookie_info);
|
||||
|
||||
Reference in New Issue
Block a user