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

Side by Side Diff: content/shell/browser/shell_content_browser_client.h

Issue 1187213002: Revert of 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: 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_SHELL_BROWSER_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 28 matching lines...) Expand all
39 URLRequestInterceptorScopedVector request_interceptors) override; 39 URLRequestInterceptorScopedVector request_interceptors) override;
40 net::URLRequestContextGetter* CreateRequestContextForStoragePartition( 40 net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
41 BrowserContext* browser_context, 41 BrowserContext* browser_context,
42 const base::FilePath& partition_path, 42 const base::FilePath& partition_path,
43 bool in_memory, 43 bool in_memory,
44 ProtocolHandlerMap* protocol_handlers, 44 ProtocolHandlerMap* protocol_handlers,
45 URLRequestInterceptorScopedVector request_interceptors) override; 45 URLRequestInterceptorScopedVector request_interceptors) override;
46 bool IsHandledURL(const GURL& url) override; 46 bool IsHandledURL(const GURL& url) override;
47 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 47 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
48 int child_process_id) override; 48 int child_process_id) override;
49 void AppendMappedFileCommandLineSwitches(
50 base::CommandLine* command_line) override;
49 void OverrideWebkitPrefs(RenderViewHost* render_view_host, 51 void OverrideWebkitPrefs(RenderViewHost* render_view_host,
50 WebPreferences* prefs) override; 52 WebPreferences* prefs) override;
51 void ResourceDispatcherHostCreated() override; 53 void ResourceDispatcherHostCreated() override;
52 AccessTokenStore* CreateAccessTokenStore() override; 54 AccessTokenStore* CreateAccessTokenStore() override;
53 std::string GetDefaultDownloadName() override; 55 std::string GetDefaultDownloadName() override;
54 WebContentsViewDelegate* GetWebContentsViewDelegate( 56 WebContentsViewDelegate* GetWebContentsViewDelegate(
55 WebContents* web_contents) override; 57 WebContents* web_contents) override;
56 QuotaPermissionContext* CreateQuotaPermissionContext() override; 58 QuotaPermissionContext* CreateQuotaPermissionContext() override;
57 void SelectClientCertificate( 59 void SelectClientCertificate(
58 WebContents* web_contents, 60 WebContents* web_contents,
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 select_client_certificate_callback_ = select_client_certificate_callback; 98 select_client_certificate_callback_ = select_client_certificate_callback;
97 } 99 }
98 100
99 private: 101 private:
100 ShellBrowserContext* ShellBrowserContextForBrowserContext( 102 ShellBrowserContext* ShellBrowserContextForBrowserContext(
101 BrowserContext* content_browser_context); 103 BrowserContext* content_browser_context);
102 104
103 scoped_ptr<ShellResourceDispatcherHostDelegate> 105 scoped_ptr<ShellResourceDispatcherHostDelegate>
104 resource_dispatcher_host_delegate_; 106 resource_dispatcher_host_delegate_;
105 107
108 #if defined(OS_POSIX) && !defined(OS_MACOSX)
109 base::ScopedFD v8_natives_fd_;
110 base::ScopedFD v8_snapshot_fd_;
111 bool natives_fd_exists() { return v8_natives_fd_ != -1; }
112 bool snapshot_fd_exists() { return v8_snapshot_fd_ != -1; }
113 #endif
114
106 base::Closure select_client_certificate_callback_; 115 base::Closure select_client_certificate_callback_;
107 116
108 ShellBrowserMainParts* shell_browser_main_parts_; 117 ShellBrowserMainParts* shell_browser_main_parts_;
109 }; 118 };
110 119
111 } // namespace content 120 } // namespace content
112 121
113 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 122 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/public/browser/content_browser_client.h ('k') | content/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698