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

Unified Diff: content/shell/browser/shell_content_browser_client.cc

Issue 1851213002: Remove sandbox on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nacl compile issues Created 4 years, 9 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 | « content/shell/browser/shell_content_browser_client.h ('k') | content/utility/utility_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/browser/shell_content_browser_client.cc
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index dd9840a749f27644ba5ca6d597f758f2f6d6ea51..4f7651b7e19f17b7a8b09c134d66f29e22756645 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -54,11 +54,6 @@
#include "content/public/common/content_descriptors.h"
#endif
-#if defined(OS_WIN)
-#include "content/common/sandbox_win.h"
-#include "sandbox/win/src/sandbox.h"
-#endif
-
#if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
#include "media/mojo/services/mojo_media_application_factory.h"
#endif
@@ -365,23 +360,6 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
}
#endif // defined(OS_ANDROID)
-#if defined(OS_WIN)
-bool ShellContentBrowserClient::PreSpawnRenderer(
- sandbox::TargetPolicy* policy) {
- // Add sideloaded font files for testing. See also DIR_WINDOWS_FONTS
- // addition in |StartSandboxedProcess|.
- std::vector<std::string> font_files = switches::GetSideloadFontFiles();
- for (std::vector<std::string>::const_iterator i(font_files.begin());
- i != font_files.end();
- ++i) {
- policy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES,
- sandbox::TargetPolicy::FILES_ALLOW_READONLY,
- base::UTF8ToWide(*i).c_str());
- }
- return true;
-}
-#endif // OS_WIN
-
ShellBrowserContext* ShellContentBrowserClient::browser_context() {
return shell_browser_main_parts_->browser_context();
}
« no previous file with comments | « content/shell/browser/shell_content_browser_client.h ('k') | content/utility/utility_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698