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

Side by Side Diff: chromecast/browser/cast_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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
6 #define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 const content::MainFunctionParams& parameters) override; 71 const content::MainFunctionParams& parameters) override;
72 void RenderProcessWillLaunch(content::RenderProcessHost* host) override; 72 void RenderProcessWillLaunch(content::RenderProcessHost* host) override;
73 net::URLRequestContextGetter* CreateRequestContext( 73 net::URLRequestContextGetter* CreateRequestContext(
74 content::BrowserContext* browser_context, 74 content::BrowserContext* browser_context,
75 content::ProtocolHandlerMap* protocol_handlers, 75 content::ProtocolHandlerMap* protocol_handlers,
76 content::URLRequestInterceptorScopedVector request_interceptors) 76 content::URLRequestInterceptorScopedVector request_interceptors)
77 override; 77 override;
78 bool IsHandledURL(const GURL& url) override; 78 bool IsHandledURL(const GURL& url) override;
79 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 79 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
80 int child_process_id) override; 80 int child_process_id) override;
81 void AppendMappedFileCommandLineSwitches(
82 base::CommandLine* command_line) override;
81 content::AccessTokenStore* CreateAccessTokenStore() override; 83 content::AccessTokenStore* CreateAccessTokenStore() override;
82 void OverrideWebkitPrefs(content::RenderViewHost* render_view_host, 84 void OverrideWebkitPrefs(content::RenderViewHost* render_view_host,
83 content::WebPreferences* prefs) override; 85 content::WebPreferences* prefs) override;
84 void ResourceDispatcherHostCreated() override; 86 void ResourceDispatcherHostCreated() override;
85 std::string GetApplicationLocale() override; 87 std::string GetApplicationLocale() override;
86 content::QuotaPermissionContext* CreateQuotaPermissionContext() override; 88 content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
87 void AllowCertificateError( 89 void AllowCertificateError(
88 int render_process_id, 90 int render_process_id,
89 int render_view_id, 91 int render_view_id,
90 int cert_error, 92 int cert_error,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 int GetCrashSignalFD(const base::CommandLine& command_line); 144 int GetCrashSignalFD(const base::CommandLine& command_line);
143 145
144 // Creates a CrashHandlerHost instance for the given process type. 146 // Creates a CrashHandlerHost instance for the given process type.
145 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( 147 breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
146 const std::string& process_type); 148 const std::string& process_type);
147 149
148 // A static cache to hold crash_handlers for each process_type 150 // A static cache to hold crash_handlers for each process_type
149 std::map<std::string, breakpad::CrashHandlerHostLinux*> crash_handlers_; 151 std::map<std::string, breakpad::CrashHandlerHostLinux*> crash_handlers_;
150 #endif 152 #endif
151 153
154 base::ScopedFD v8_natives_fd_;
155 base::ScopedFD v8_snapshot_fd_;
156 bool natives_fd_exists() { return v8_natives_fd_ != -1; }
157 bool snapshot_fd_exists() { return v8_snapshot_fd_ != -1; }
158
152 scoped_ptr<URLRequestContextFactory> url_request_context_factory_; 159 scoped_ptr<URLRequestContextFactory> url_request_context_factory_;
153 160
154 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient); 161 DISALLOW_COPY_AND_ASSIGN(CastContentBrowserClient);
155 }; 162 };
156 163
157 } // namespace shell 164 } // namespace shell
158 } // namespace chromecast 165 } // namespace chromecast
159 166
160 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_ 167 #endif // CHROMECAST_BROWSER_CAST_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chromecast/browser/cast_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698