diff options
19 files changed, 58 insertions, 202 deletions
diff --git a/content/browser/battery_status/battery_monitor_integration_browsertest.cc b/content/browser/battery_status/battery_monitor_integration_browsertest.cc index a201ef8..541d769 100644 --- a/content/browser/battery_status/battery_monitor_integration_browsertest.cc +++ b/content/browser/battery_status/battery_monitor_integration_browsertest.cc @@ -101,13 +101,6 @@ class TestContentBrowserClient : public ContentBrowserClient { command_line, child_process_id, mappings); } #endif // defined(OS_ANDROID) - -#if defined(OS_WIN) - void PreSpawnRenderer(sandbox::TargetPolicy* policy, - bool* success) override { - ShellContentBrowserClient::AddFontSpecificFSPolicies(policy); - } -#endif }; class BatteryMonitorIntegrationTest : public ContentBrowserTest { diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index f117ebb..69d34d5 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -175,17 +175,11 @@ #endif #if defined(OS_WIN) -#include "base/memory/shared_memory.h" -#include "base/strings/string16.h" -#include "base/strings/string_number_conversions.h" #include "base/win/scoped_com_initializer.h" -#include "base/win/scoped_handle.h" #include "base/win/windows_version.h" #include "content/common/font_cache_dispatcher_win.h" #include "content/common/sandbox_win.h" -#include "content/public/common/dwrite_font_platform_win.h" #include "sandbox/win/src/sandbox_policy.h" -#include "ui/gfx/win/direct_write.h" #include "ui/gfx/win/dpi.h" #endif @@ -1204,6 +1198,9 @@ void RenderProcessHostImpl::AppendRendererCommandLine( #if defined(OS_WIN) command_line->AppendSwitchASCII(switches::kDeviceScaleFactor, base::DoubleToString(gfx::GetDPIScale())); + command_line->AppendSwitchASCII( + switches::kFontCacheSharedMemSuffix, + base::UintToString(base::GetCurrentProcId())); #endif AppendCompositorCommandLineFlags(command_line); @@ -2342,9 +2339,6 @@ void RenderProcessHostImpl::OnProcessLaunched() { FROM_HERE_WITH_EXPLICIT_FUNCTION( "465841 " "RenderProcessHostImpl::OnProcessLaunched::SendQueuedMessages")); - - PlatformProcessLaunched(); - while (!queued_messages_.empty()) { Send(queued_messages_.front()); queued_messages_.pop(); @@ -2502,28 +2496,4 @@ void RenderProcessHostImpl::GetAudioOutputControllers( audio_renderer_host()->GetOutputControllers(callback); } -#if !defined(OS_WIN) -void RenderProcessHostImpl::PlatformProcessLaunched() {} -#else -void RenderProcessHostImpl::PlatformProcessLaunched() { - // If DirectWrite is enabled for font rendering then this function sends the - // font cache section handle to the renderer process. If the handle is not - // available (which could happen if we are launched as part of content, or - // because the cache is not available yet), then we send a NULL section handle - // to the renderer which ensures that the DirectWrite factory is initialized - // correctly. - if (!run_renderer_in_process() && gfx::win::ShouldUseDirectWrite()) { - std::string name(content::kFontCacheSharedSectionName); - name.append(base::UintToString(base::GetCurrentProcId())); - base::SharedMemory font_cache_section; - base::SharedMemoryHandle mapped_handle = NULL; - if (font_cache_section.Open(name, true)) { - font_cache_section.ShareReadOnlyToProcess(GetHandle(), &mapped_handle); - DCHECK(mapped_handle); - } - Send(new ViewMsg_DirectWriteFontCacheSectionHandle(mapped_handle)); - } -} -#endif - } // namespace content diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index 92fc5d8..5a6935b 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h @@ -353,9 +353,6 @@ class CONTENT_EXPORT RenderProcessHostImpl void SendDisableAecDumpToRenderer(); #endif - // Platform specific handling for renderer process launches goes here. - void PlatformProcessLaunched(); - scoped_ptr<MojoApplicationHost> mojo_application_host_; // The registered IPC listener objects. When this list is empty, we should diff --git a/content/common/dwrite_font_platform_win.cc b/content/common/dwrite_font_platform_win.cc index 3eccac1..4847963 100644 --- a/content/common/dwrite_font_platform_win.cc +++ b/content/common/dwrite_font_platform_win.cc @@ -142,10 +142,6 @@ bool ValidateFontCacheHeader(CacheFileHeader* header) { class FontCacheWriter; -// Handle to the global font cache section. Owned by the shared section -// instance which maps it. -HANDLE g_font_cache_section = NULL; - // This class implements main interface required for loading custom font // collection as specified by DirectWrite. We also use this class for storing // some state information as this is one of the centralized entity. @@ -716,8 +712,16 @@ HRESULT STDMETHODCALLTYPE FontCollectionLoader::CreateEnumeratorFromKey( // static HRESULT FontCollectionLoader::Initialize(IDWriteFactory* factory) { - content::InitializeFontLoader(); - CHECK(g_font_loader); + DCHECK(g_font_loader == NULL); + + HRESULT result; + result = mswr::MakeAndInitialize<FontCollectionLoader>(&g_font_loader); + if (FAILED(result) || !g_font_loader) { + DCHECK(false); + return E_FAIL; + } + + CHECK(g_font_loader->LoadFontListFromRegistry()); g_font_loader->file_loader_ = mswr::Make<FontFileLoader>().Detach(); @@ -917,11 +921,16 @@ bool FontCollectionLoader::IsFileCached(UINT32 font_key) { } bool FontCollectionLoader::LoadCacheFile() { - if (!g_font_cache_section) + if (!base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kFontCacheSharedMemSuffix)) { + return false; + } + base::SharedMemory* shared_mem = new base::SharedMemory(); + std::string name(content::kFontCacheSharedSectionName); + name.append(base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( + switches::kFontCacheSharedMemSuffix)); + if (!shared_mem->Open(name.c_str(), true)) return false; - - base::SharedMemory* shared_mem = new base::SharedMemory( - g_font_cache_section, true); // Map while file shared_mem->Map(0); @@ -1100,7 +1109,7 @@ IDWriteFontCollection* GetCustomFontCollection(IDWriteFactory* factory) { bool BuildFontCacheInternal(const WCHAR* file_name) { typedef decltype(DWriteCreateFactory)* DWriteCreateFactoryProc; - HMODULE dwrite_dll = ::LoadLibrary(L"dwrite.dll"); + HMODULE dwrite_dll = LoadLibraryW(L"dwrite.dll"); if (!dwrite_dll) { DWORD load_library_get_last_error = GetLastError(); base::debug::Alias(&dwrite_dll); @@ -1215,21 +1224,4 @@ bool BuildFontCache(const base::FilePath& file) { return BuildFontCacheInternal(file.value().c_str()); } -void SetDirectWriteFontCache(HANDLE font_cache_section) { - g_font_cache_section = font_cache_section; -} - -void InitializeFontLoader() { - if (g_font_loader) - return; - - HRESULT result = E_FAIL; - result = mswr::MakeAndInitialize<FontCollectionLoader>(&g_font_loader); - if (FAILED(result) || !g_font_loader) { - DCHECK(false); - return; - } - CHECK(g_font_loader->LoadFontListFromRegistry()); -} - } // namespace content diff --git a/content/common/view_messages.h b/content/common/view_messages.h index 17cd7f1..3a0af19 100644 --- a/content/common/view_messages.h +++ b/content/common/view_messages.h @@ -993,14 +993,6 @@ IPC_MESSAGE_ROUTED1(ViewMsg_ForceRedraw, IPC_MESSAGE_ROUTED1(ViewMsg_BeginFrame, cc::BeginFrameArgs /* args */) -#if defined(OS_WIN) -// If DirectWrite is enabled for font rendering then this message contains the -// font cache section handle valid in the renderer's address space. -IPC_MESSAGE_CONTROL1(ViewMsg_DirectWriteFontCacheSectionHandle, - base::SharedMemoryHandle /* The font section shared - memory handle */) -#endif - // ----------------------------------------------------------------------------- // Messages sent from the renderer to the browser. diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc index 0a0a9c7..f740377 100644 --- a/content/public/common/content_switches.cc +++ b/content/public/common/content_switches.cc @@ -985,6 +985,11 @@ const char kDisableWin32kRendererLockDown[] = const char kEnableWin32kRendererLockDown[] = "enable-win32k-renderer-lockdown"; +// DirectWrite FontCache is shared by browser to renderers using shared memory. +// This switch allows specifying suffix to shared memory section name to avoid +// clashes between different instances of Chrome. +const char kFontCacheSharedMemSuffix[] = "font-cache-shared-mem-suffix"; + // Enables the exporting of the tracing events to ETW. This is only supported on // Windows Vista and later. const char kTraceExportEventsToETW[] = "trace-export-events-to-etw"; diff --git a/content/public/common/content_switches.h b/content/public/common/content_switches.h index d6eff07..fbcb796 100644 --- a/content/public/common/content_switches.h +++ b/content/public/common/content_switches.h @@ -293,6 +293,9 @@ CONTENT_EXPORT extern const char kDisableLegacyIntermediateWindow[]; // mitigation. CONTENT_EXPORT extern const char kDisableWin32kRendererLockDown[]; CONTENT_EXPORT extern const char kEnableWin32kRendererLockDown[]; +// Switch to uniquely identify names shared memory section for font cache +// across chromium flavors. +CONTENT_EXPORT extern const char kFontCacheSharedMemSuffix[]; CONTENT_EXPORT extern const char kTraceExportEventsToETW[]; #endif diff --git a/content/public/common/dwrite_font_platform_win.h b/content/public/common/dwrite_font_platform_win.h index 021599c..4c988bc 100644 --- a/content/public/common/dwrite_font_platform_win.h +++ b/content/public/common/dwrite_font_platform_win.h @@ -36,12 +36,6 @@ CONTENT_EXPORT bool LoadFontCache(const base::FilePath& path); // Added in header mainly for unittest CONTENT_EXPORT bool ValidateFontCacheFile(base::File* file); -// DirectWrite Font loader initialization. -CONTENT_EXPORT void InitializeFontLoader(); - -// Sets the DirectWrite font cache section handle. -CONTENT_EXPORT void SetDirectWriteFontCache(HANDLE font_cache_section); - } // namespace content #endif // CONTENT_PUBLIC_COMMON_DWRITE_FONT_PLATFORM_WIN_H_ diff --git a/content/public/renderer/render_font_warmup_win.h b/content/public/renderer/render_font_warmup_win.h index a994dbb..9624d88 100644 --- a/content/public/renderer/render_font_warmup_win.h +++ b/content/public/renderer/render_font_warmup_win.h @@ -5,8 +5,6 @@ #ifndef CONTENT_PUBLIC_RENDERER_RENDER_FONT_WARMUP_WIN_H_ #define CONTENT_PUBLIC_RENDERER_RENDER_FONT_WARMUP_WIN_H_ -#include <windows.h> - #include "content/common/content_export.h" class SkFontMgr; @@ -20,15 +18,7 @@ CONTENT_EXPORT void DoPreSandboxWarmupForTypeface(SkTypeface* typeface); // Get the shared font manager used during pre-sandbox warmup for DirectWrite // fonts. -CONTENT_EXPORT SkFontMgr* GetDirectWriteFontManager(); - -// Pre-sandbox font warmup for the DirectWrite font loader. -CONTENT_EXPORT void DoPreSandboxWarmupForFontLoader(); - -// Sets the DirectWrite font cache mapped section handle in the renderer -// process. -CONTENT_EXPORT void SetDirectWriteFontCacheSectionHandle( - HANDLE font_cache_section); +CONTENT_EXPORT SkFontMgr* GetPreSandboxWarmupFontMgr(); } // namespace content diff --git a/content/renderer/render_font_warmup_win.cc b/content/renderer/render_font_warmup_win.cc index 863b657..3fc90f1 100644 --- a/content/renderer/render_font_warmup_win.cc +++ b/content/renderer/render_font_warmup_win.cc @@ -11,7 +11,6 @@ #include "base/win/iat_patch_function.h" #include "base/win/windows_version.h" #include "content/public/common/dwrite_font_platform_win.h" -#include "skia/ext/fontmgr_default_win.h" #include "third_party/WebKit/public/web/win/WebFontRendering.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/ports/SkFontMgr.h" @@ -132,9 +131,7 @@ void PatchServiceManagerCalls() { // before sandbox lock down to allow Skia access to the Font Manager service. void CreateDirectWriteFactory(IDWriteFactory** factory) { typedef decltype(DWriteCreateFactory)* DWriteCreateFactoryProc; - HMODULE dwrite_dll = ::GetModuleHandle(L"dwrite.dll"); - if (!dwrite_dll) - dwrite_dll = ::LoadLibrary(L"dwrite.dll"); + HMODULE dwrite_dll = LoadLibraryW(L"dwrite.dll"); // TODO(scottmg): Temporary code to track crash in http://crbug.com/387867. if (!dwrite_dll) { DWORD load_library_get_last_error = GetLastError(); @@ -182,11 +179,20 @@ void PatchDWriteFactory(IDWriteFactory* factory) { } // namespace -SkFontMgr* GetDirectWriteFontManager() { +void DoPreSandboxWarmupForTypeface(SkTypeface* typeface) { + SkPaint paint_warmup; + paint_warmup.setTypeface(typeface); + wchar_t glyph = L'S'; + paint_warmup.measureText(&glyph, 2); +} + +SkFontMgr* GetPreSandboxWarmupFontMgr() { if (!g_warmup_fontmgr) { IDWriteFactory* factory; CreateDirectWriteFactory(&factory); + GetCustomFontCollection(factory); + PatchDWriteFactory(factory); blink::WebFontRendering::setDirectWriteFactory(factory); @@ -195,15 +201,4 @@ SkFontMgr* GetDirectWriteFontManager() { return g_warmup_fontmgr; } -void DoPreSandboxWarmupForFontLoader() { - InitializeFontLoader(); -} - -void SetDirectWriteFontCacheSectionHandle(HANDLE font_cache_section) { - SetDirectWriteFontCache(font_cache_section); - // The objects used here are intentionally not freed as we want the Skia - // code to use these objects after warmup. - SetDefaultSkiaFactory(GetDirectWriteFontManager()); -} - } // namespace content diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 3821ff7d7..896d5cb 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -161,7 +161,6 @@ #if defined(OS_WIN) #include <windows.h> #include <objbase.h> -#include "content/public/renderer/render_font_warmup_win.h" #else // TODO(port) #include "content/child/npapi/np_channel_base.h" @@ -1380,11 +1379,6 @@ void RenderThreadImpl::PreCacheFontCharacters(const LOGFONT& log_font, Send(new ViewHostMsg_PreCacheFontCharacters(log_font, str)); } -void RenderThreadImpl::OnSetDirectWriteFontCacheHandle( - HANDLE font_cache_handle) { - content::SetDirectWriteFontCacheSectionHandle(font_cache_handle); -} - #endif // OS_WIN ServiceRegistry* RenderThreadImpl::GetServiceRegistry() { @@ -1564,10 +1558,6 @@ bool RenderThreadImpl::OnControlMessageReceived(const IPC::Message& msg) { #if defined(ENABLE_PLUGINS) IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache, OnPurgePluginListCache) #endif -#if defined(OS_WIN) - IPC_MESSAGE_HANDLER(ViewMsg_DirectWriteFontCacheSectionHandle, - OnSetDirectWriteFontCacheHandle) -#endif IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h index f86e190..c4f760b 100644 --- a/content/renderer/render_thread_impl.h +++ b/content/renderer/render_thread_impl.h @@ -344,7 +344,6 @@ class CONTENT_EXPORT RenderThreadImpl #if defined(OS_WIN) void PreCacheFontCharacters(const LOGFONT& log_font, const base::string16& str); - void OnSetDirectWriteFontCacheHandle(HANDLE font_cache_handle); #endif #if defined(ENABLE_WEBRTC) diff --git a/content/renderer/renderer_main_platform_delegate_win.cc b/content/renderer/renderer_main_platform_delegate_win.cc index 310bf0f..6fa56eb 100644 --- a/content/renderer/renderer_main_platform_delegate_win.cc +++ b/content/renderer/renderer_main_platform_delegate_win.cc @@ -53,8 +53,18 @@ void SkiaPreCacheFontCharacters(const LOGFONT& logfont, } void WarmupDirectWrite() { - ::LoadLibrary(L"dwrite.dll"); - DoPreSandboxWarmupForFontLoader(); + // The objects used here are intentionally not freed as we want the Skia + // code to use these objects after warmup. + SetDefaultSkiaFactory(GetPreSandboxWarmupFontMgr()); + + // We need to warm up *some* font for DirectWrite. We also need to pass one + // down for the CC HUD code, so use the same one here. Note that we don't use + // a monospace as would be nice in an attempt to avoid a small startup time + // regression, see http://crbug.com/463613. + skia::RefPtr<SkTypeface> hud_typeface = skia::AdoptRef( + GetPreSandboxWarmupFontMgr()->legacyCreateTypeface("Times New Roman", 0)); + DoPreSandboxWarmupForTypeface(hud_typeface.get()); + gfx::SetHudTypeface(hud_typeface); } } // namespace diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc index df97917..fc03843 100644 --- a/content/shell/browser/shell_content_browser_client.cc +++ b/content/shell/browser/shell_content_browser_client.cc @@ -54,7 +54,6 @@ #if defined(OS_WIN) #include "content/common/sandbox_win.h" #include "sandbox/win/src/sandbox.h" -#include "ui/gfx/win/direct_write.h" #endif namespace content { @@ -407,34 +406,7 @@ void ShellContentBrowserClient::PreSpawnRenderer(sandbox::TargetPolicy* policy, sandbox::TargetPolicy::FILES_ALLOW_READONLY, base::UTF8ToWide(*i).c_str()); } - AddFontSpecificFSPolicies(policy); } - -void ShellContentBrowserClient::AddFontSpecificFSPolicies( - sandbox::TargetPolicy* policy) { - // If DirectWrite is enabled then we need to grant access to the - // Windows National Language support directory :- - // c:\windows\globalization\sorting. Not having access to this folder - // causes DirectWrite font cache setup to fail. - if (gfx::win::ShouldUseDirectWrite()) { - base::FilePath windows_root; - PathService::Get(base::DIR_WINDOWS, &windows_root); - base::string16 globalization_path = windows_root.value(); - globalization_path += L"\\Globalization\\Sorting"; - - policy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES, - sandbox::TargetPolicy::FILES_ALLOW_READONLY, - globalization_path.c_str()); - - // We need to grant access to subdirectories and files within the - // globalization directory. - globalization_path += L"\\*"; - policy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES, - sandbox::TargetPolicy::FILES_ALLOW_READONLY, - globalization_path.c_str()); - } -} - #endif // OS_WIN ShellBrowserContext* ShellContentBrowserClient::browser_context() { diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h index 9617e15..0dc59b2 100644 --- a/content/shell/browser/shell_content_browser_client.h +++ b/content/shell/browser/shell_content_browser_client.h @@ -78,11 +78,7 @@ class ShellContentBrowserClient : public ContentBrowserClient { FileDescriptorInfo* mappings) override; #endif #if defined(OS_WIN) - void PreSpawnRenderer(sandbox::TargetPolicy* policy, - bool* success) override; - // Helper function to add font specific file system policies for renderer - // processes. Currently only adds policies if DirectWrite is enabled. - static void AddFontSpecificFSPolicies(sandbox::TargetPolicy* policy); + void PreSpawnRenderer(sandbox::TargetPolicy* policy, bool* success) override; #endif ShellBrowserContext* browser_context(); diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc index 7312196..06603c1 100644 --- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc +++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc @@ -61,6 +61,7 @@ void RegisterSideloadedTypefaces(SkFontMgr* fontmgr) { i != files.end(); ++i) { SkTypeface* typeface = fontmgr->createFromFile(i->c_str()); + DoPreSandboxWarmupForTypeface(typeface); blink::WebFontRendering::addSideloadedFontForTesting(typeface); } } @@ -75,7 +76,7 @@ LayoutTestContentRendererClient::LayoutTestContentRendererClient() { #if defined(OS_WIN) if (gfx::win::ShouldUseDirectWrite()) - RegisterSideloadedTypefaces(GetDirectWriteFontManager()); + RegisterSideloadedTypefaces(GetPreSandboxWarmupFontMgr()); #endif } diff --git a/extensions/DEPS b/extensions/DEPS index 61251ff..285b7d3 100644 --- a/extensions/DEPS +++ b/extensions/DEPS @@ -13,8 +13,6 @@ include_rules = [ "+grit/extensions_renderer_resources.h", "+grit/extensions_resources.h", "+testing", - "+sandbox/win/src/sandbox.h", - "+sandbox/win/src/sandbox_policy.h", "+third_party/mojo/src/mojo/public", "+third_party/skia/include", diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc index c5a8c07..4aba570 100644 --- a/extensions/shell/browser/shell_content_browser_client.cc +++ b/extensions/shell/browser/shell_content_browser_client.cc @@ -40,12 +40,6 @@ #include "content/public/browser/child_process_data.h" #endif -#if defined(OS_WIN) -#include "base/path_service.h" -#include "sandbox/win/src/sandbox_policy.h" -#include "ui/gfx/win/direct_write.h" -#endif - using base::CommandLine; using content::BrowserContext; using content::BrowserThread; @@ -280,36 +274,6 @@ ShellContentBrowserClient::GetDevToolsManagerDelegate() { return new content::ShellDevToolsManagerDelegate(GetBrowserContext()); } -#if defined(OS_WIN) -// TODO(ananta) -// Consolidate the policy code below with similar code in -// content/shell/browser/shell_content_browser_client.h. -void ShellContentBrowserClient::PreSpawnRenderer(sandbox::TargetPolicy* policy, - bool* success) { - // If DirectWrite is enabled then we need to grant access to the - // Windows National Language support directory :- - // c:\windows\globalization\sorting. Not having access to this folder - // causes DirectWrite font cache setup to fail. - if (gfx::win::ShouldUseDirectWrite()) { - base::FilePath windows_root; - PathService::Get(base::DIR_WINDOWS, &windows_root); - base::string16 globalization_path = windows_root.value(); - globalization_path += L"\\Globalization\\Sorting"; - - policy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES, - sandbox::TargetPolicy::FILES_ALLOW_READONLY, - globalization_path.c_str()); - - // We need to grant access to subdirectories and files within the - // globalization directory. - globalization_path += L"\\*"; - policy->AddRule(sandbox::TargetPolicy::SUBSYS_FILES, - sandbox::TargetPolicy::FILES_ALLOW_READONLY, - globalization_path.c_str()); - } -} -#endif - ShellBrowserMainParts* ShellContentBrowserClient::CreateShellBrowserMainParts( const content::MainFunctionParams& parameters, ShellBrowserMainDelegate* browser_main_delegate) { diff --git a/extensions/shell/browser/shell_content_browser_client.h b/extensions/shell/browser/shell_content_browser_client.h index 44d1113..f9d813f 100644 --- a/extensions/shell/browser/shell_content_browser_client.h +++ b/extensions/shell/browser/shell_content_browser_client.h @@ -67,11 +67,6 @@ class ShellContentBrowserClient : public content::ContentBrowserClient { content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; -#if defined(OS_WIN) - void PreSpawnRenderer(sandbox::TargetPolicy* policy, - bool* success) override; -#endif - protected: // Subclasses may wish to provide their own ShellBrowserMainParts. virtual ShellBrowserMainParts* CreateShellBrowserMainParts( |