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

Side by Side Diff: ash/shell/content_client/shell_content_browser_client.h

Issue 1182443003: Moved logic for mapping child process FDs for ICU and V8 into child_process_launcher.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix lin Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/shell/content_client/shell_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 15 matching lines...) Expand all
26 ShellContentBrowserClient(); 26 ShellContentBrowserClient();
27 ~ShellContentBrowserClient() override; 27 ~ShellContentBrowserClient() override;
28 28
29 // Overridden from content::ContentBrowserClient: 29 // Overridden from content::ContentBrowserClient:
30 content::BrowserMainParts* CreateBrowserMainParts( 30 content::BrowserMainParts* CreateBrowserMainParts(
31 const content::MainFunctionParams& parameters) override; 31 const content::MainFunctionParams& parameters) override;
32 net::URLRequestContextGetter* CreateRequestContext( 32 net::URLRequestContextGetter* CreateRequestContext(
33 content::BrowserContext* browser_context, 33 content::BrowserContext* browser_context,
34 content::ProtocolHandlerMap* protocol_handlers, 34 content::ProtocolHandlerMap* protocol_handlers,
35 content::URLRequestInterceptorScopedVector request_interceptors) override; 35 content::URLRequestInterceptorScopedVector request_interceptors) override;
36 void AppendMappedFileCommandLineSwitches(
37 base::CommandLine* command_line) override;
38 #if defined(OS_POSIX) && !defined(OS_MACOSX)
39 void GetAdditionalMappedFilesForChildProcess(
40 const base::CommandLine& command_line,
41 int child_process_id,
42 content::FileDescriptorInfo* mappings) override;
43 #endif
44 36
45 content::ShellBrowserContext* browser_context(); 37 content::ShellBrowserContext* browser_context();
46 38
47 private: 39 private:
48 #if defined(OS_POSIX) && !defined(OS_MACOSX)
49 bool natives_fd_exists() { return v8_natives_fd_.is_valid(); }
50 bool snapshot_fd_exists() { return v8_snapshot_fd_.is_valid(); }
51
52 base::ScopedFD v8_natives_fd_;
53 base::ScopedFD v8_snapshot_fd_;
54 #endif
55
56 ShellBrowserMainParts* shell_browser_main_parts_; 40 ShellBrowserMainParts* shell_browser_main_parts_;
57 41
58 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); 42 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
59 }; 43 };
60 44
61 } // namespace shell 45 } // namespace shell
62 } // namespace ash 46 } // namespace ash
63 47
64 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 48 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell/content_client/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698