| Index: chrome/browser/chrome_content_browser_client.h
|
| diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
|
| index dd23bded1a0a27b520144ce04917f0db0b479d44..6d6f8bb57ab5d0cf5c7e17a88014ab2f4bfc002b 100644
|
| --- a/chrome/browser/chrome_content_browser_client.h
|
| +++ b/chrome/browser/chrome_content_browser_client.h
|
| @@ -258,18 +258,12 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| content::RenderFrameHost* render_frame_host,
|
| blink::WebPageVisibilityState* visibility_state) override;
|
|
|
| -#if defined(OS_ANDROID)
|
| - void GetAdditionalMappedFilesForChildProcess(
|
| - const base::CommandLine& command_line,
|
| - int child_process_id,
|
| - content::FileDescriptorInfo* mappings,
|
| - std::map<int, base::MemoryMappedFile::Region>* regions) override;
|
| -#elif defined(OS_POSIX) && !defined(OS_MACOSX)
|
| +#if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| void GetAdditionalMappedFilesForChildProcess(
|
| const base::CommandLine& command_line,
|
| int child_process_id,
|
| content::FileDescriptorInfo* mappings) override;
|
| -#endif // defined(OS_ANDROID)
|
| +#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
|
| #if defined(OS_WIN)
|
| bool PreSpawnRenderer(sandbox::TargetPolicy* policy) override;
|
| base::string16 GetAppContainerSidForSandboxType(
|
|
|