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

Side by Side Diff: chrome/browser/chrome_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
« no previous file with comments | « base/i18n/icu_util.cc ('k') | chrome/browser/chrome_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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 const GURL& new_url) override; 105 const GURL& new_url) override;
106 bool ShouldSwapProcessesForRedirect( 106 bool ShouldSwapProcessesForRedirect(
107 content::ResourceContext* resource_context, 107 content::ResourceContext* resource_context,
108 const GURL& current_url, 108 const GURL& current_url,
109 const GURL& new_url) override; 109 const GURL& new_url) override;
110 bool ShouldAssignSiteForURL(const GURL& url) override; 110 bool ShouldAssignSiteForURL(const GURL& url) override;
111 std::string GetCanonicalEncodingNameByAliasName( 111 std::string GetCanonicalEncodingNameByAliasName(
112 const std::string& alias_name) override; 112 const std::string& alias_name) override;
113 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 113 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
114 int child_process_id) override; 114 int child_process_id) override;
115 void AppendMappedFileCommandLineSwitches(
116 base::CommandLine* command_line) override;
115 std::string GetApplicationLocale() override; 117 std::string GetApplicationLocale() override;
116 std::string GetAcceptLangs(content::BrowserContext* context) override; 118 std::string GetAcceptLangs(content::BrowserContext* context) override;
117 const gfx::ImageSkia* GetDefaultFavicon() override; 119 const gfx::ImageSkia* GetDefaultFavicon() override;
118 bool AllowAppCache(const GURL& manifest_url, 120 bool AllowAppCache(const GURL& manifest_url,
119 const GURL& first_party, 121 const GURL& first_party,
120 content::ResourceContext* context) override; 122 content::ResourceContext* context) override;
121 bool AllowServiceWorker(const GURL& scope, 123 bool AllowServiceWorker(const GURL& scope,
122 const GURL& first_party, 124 const GURL& first_party,
123 content::ResourceContext* context, 125 content::ResourceContext* context,
124 int render_process_id, 126 int render_process_id,
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 #if defined(ENABLE_PLUGINS) 300 #if defined(ENABLE_PLUGINS)
299 // Set of origins that can use TCP/UDP private APIs from NaCl. 301 // Set of origins that can use TCP/UDP private APIs from NaCl.
300 std::set<std::string> allowed_socket_origins_; 302 std::set<std::string> allowed_socket_origins_;
301 // Set of origins that can get a handle for FileIO from NaCl. 303 // Set of origins that can get a handle for FileIO from NaCl.
302 std::set<std::string> allowed_file_handle_origins_; 304 std::set<std::string> allowed_file_handle_origins_;
303 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable 305 // Set of origins that can use "dev chanel" APIs from NaCl, even on stable
304 // versions of Chrome. 306 // versions of Chrome.
305 std::set<std::string> allowed_dev_channel_origins_; 307 std::set<std::string> allowed_dev_channel_origins_;
306 #endif 308 #endif
307 309
310 #if defined(OS_POSIX) && !defined(OS_MACOSX)
311 base::ScopedFD v8_natives_fd_;
312 base::ScopedFD v8_snapshot_fd_;
313 bool natives_fd_exists() { return v8_natives_fd_ != -1; }
314 bool snapshot_fd_exists() { return v8_snapshot_fd_ != -1; }
315 #endif // OS_POSIX && !OS_MACOSX
316
308 // Vector of additional ChromeContentBrowserClientParts. 317 // Vector of additional ChromeContentBrowserClientParts.
309 // Parts are deleted in the reverse order they are added. 318 // Parts are deleted in the reverse order they are added.
310 std::vector<ChromeContentBrowserClientParts*> extra_parts_; 319 std::vector<ChromeContentBrowserClientParts*> extra_parts_;
311 320
312 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; 321 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
313 322
314 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 323 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
315 }; 324 };
316 325
317 } // namespace chrome 326 } // namespace chrome
318 327
319 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 328 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « base/i18n/icu_util.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698