Skip to content

Commit

Permalink
5492605: Migrate TODOs referencing old crbug IDs to the new issue tra…
Browse files Browse the repository at this point in the history
  • Loading branch information
VerteDinde committed May 10, 2024
1 parent 61123d3 commit 01bbc6b
Showing 1 changed file with 5 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ it in Electron and prevent drift from Chrome's blocklist. We should look for a w
to upstream this change to Chrome.

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
index a68fd4f139ca92e154da5293481e4d8795cfff16..920e5824b899f02f7849a9fe5dd3c54be38e82a2 100644
index f56960eb24c9f30d87fe71d09a92a40b4ef35e8d..920e5824b899f02f7849a9fe5dd3c54be38e82a2 100644
--- 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
@@ -38,7 +38,6 @@
Expand All @@ -19,7 +19,7 @@ index a68fd4f139ca92e154da5293481e4d8795cfff16..920e5824b899f02f7849a9fe5dd3c54b
#include "chrome/grit/generated_resources.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings.h"
@@ -222,120 +221,10 @@ bool MaybeIsLocalUNCPath(const base::FilePath& path) {
@@ -222,118 +221,10 @@ bool MaybeIsLocalUNCPath(const base::FilePath& path) {
}
#endif

Expand Down Expand Up @@ -68,9 +68,7 @@ index a68fd4f139ca92e154da5293481e4d8795cfff16..920e5824b899f02f7849a9fe5dd3c54b
- {chrome::DIR_DEFAULT_DOWNLOADS_SAFE, nullptr, kDontBlockChildren},
- // The Chrome installation itself should not be modified by the web.
- {base::DIR_EXE, nullptr, kBlockAllChildren},
-#if !BUILDFLAG(IS_FUCHSIA)
- {base::DIR_MODULE, nullptr, kBlockAllChildren},
-#endif
- {base::DIR_ASSETS, nullptr, kBlockAllChildren},
- // And neither should the configuration of at least the currently running
- // Chrome instance (note that this does not take --user-data-dir command
Expand Down Expand Up @@ -145,7 +143,7 @@ index a68fd4f139ca92e154da5293481e4d8795cfff16..920e5824b899f02f7849a9fe5dd3c54b
// Describes a rule for blocking a directory, which can be constructed
// dynamically (based on state) or statically (from kBlockedPaths).
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
index dfbb68029c01d29616ae73e3d36fdcd24c64f39f..bd5b673e07b2718a7377fc56363e300d9a99cfa1 100644
index dfbb68029c01d29616ae73e3d36fdcd24c64f39f..1865c7ae41c043e0a08dfd32e704919b016d5fbd 100644
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.h
@@ -17,12 +17,13 @@
Expand Down Expand Up @@ -173,7 +171,7 @@ index dfbb68029c01d29616ae73e3d36fdcd24c64f39f..bd5b673e07b2718a7377fc56363e300d
#include "chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h"
#include "components/enterprise/common/files_scan_data.h"
#endif
@@ -331,6 +333,121 @@ class ChromeFileSystemAccessPermissionContext
@@ -331,6 +333,119 @@ class ChromeFileSystemAccessPermissionContext
// chrome://settings/content/filesystem UI.
static constexpr char kPermissionPathKey[] = "path";

Expand Down Expand Up @@ -222,9 +220,7 @@ index dfbb68029c01d29616ae73e3d36fdcd24c64f39f..bd5b673e07b2718a7377fc56363e300d
+ {chrome::DIR_DEFAULT_DOWNLOADS_SAFE, nullptr, kDontBlockChildren},
+ // The Chrome installation itself should not be modified by the web.
+ {base::DIR_EXE, nullptr, kBlockAllChildren},
+ #if !BUILDFLAG(IS_FUCHSIA)
+ {base::DIR_MODULE, nullptr, kBlockAllChildren},
+ #endif
+ {base::DIR_ASSETS, nullptr, kBlockAllChildren},
+ // And neither should the configuration of at least the currently running
+ // Chrome instance (note that this does not take --user-data-dir command
Expand Down Expand Up @@ -295,7 +291,7 @@ index dfbb68029c01d29616ae73e3d36fdcd24c64f39f..bd5b673e07b2718a7377fc56363e300d
protected:
SEQUENCE_CHECKER(sequence_checker_);

@@ -350,7 +467,7 @@ class ChromeFileSystemAccessPermissionContext
@@ -350,7 +465,7 @@ class ChromeFileSystemAccessPermissionContext

void PermissionGrantDestroyed(PermissionGrantImpl* grant);

Expand Down

0 comments on commit 01bbc6b

Please sign in to comment.