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

Side by Side Diff: content/public/browser/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 | « content/content_browser.gypi ('k') | content/shell/browser/shell_content_browser_client.h » ('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 CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 6 #define CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 // See CharacterEncoding's comment. 268 // See CharacterEncoding's comment.
269 virtual std::string GetCanonicalEncodingNameByAliasName( 269 virtual std::string GetCanonicalEncodingNameByAliasName(
270 const std::string& alias_name); 270 const std::string& alias_name);
271 271
272 // Allows the embedder to pass extra command line flags. 272 // Allows the embedder to pass extra command line flags.
273 // switches::kProcessType will already be set at this point. 273 // switches::kProcessType will already be set at this point.
274 virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 274 virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
275 int child_process_id) {} 275 int child_process_id) {}
276 276
277 // This is called on the process launching thread, when files that should be
278 // passed to the client have been opened. It allows command line switches to
279 // be added to tell the client where to find its files.
280 virtual void AppendMappedFileCommandLineSwitches(
281 base::CommandLine* command_line) {}
282
277 // Returns the locale used by the application. 283 // Returns the locale used by the application.
278 // This is called on the UI and IO threads. 284 // This is called on the UI and IO threads.
279 virtual std::string GetApplicationLocale(); 285 virtual std::string GetApplicationLocale();
280 286
281 // Returns the languages used in the Accept-Languages HTTP header. 287 // Returns the languages used in the Accept-Languages HTTP header.
282 // (Not called GetAcceptLanguages so it doesn't clash with win32). 288 // (Not called GetAcceptLanguages so it doesn't clash with win32).
283 virtual std::string GetAcceptLangs(BrowserContext* context); 289 virtual std::string GetAcceptLangs(BrowserContext* context);
284 290
285 // Returns the default favicon. The callee doesn't own the given bitmap. 291 // Returns the default favicon. The callee doesn't own the given bitmap.
286 virtual const gfx::ImageSkia* GetDefaultFavicon(); 292 virtual const gfx::ImageSkia* GetDefaultFavicon();
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 // Allows an embedder to provide its own ExternalVideoSurfaceContainer 646 // Allows an embedder to provide its own ExternalVideoSurfaceContainer
641 // implementation. Return nullptr to disable external surface video. 647 // implementation. Return nullptr to disable external surface video.
642 virtual ExternalVideoSurfaceContainer* 648 virtual ExternalVideoSurfaceContainer*
643 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents); 649 OverrideCreateExternalVideoSurfaceContainer(WebContents* web_contents);
644 #endif 650 #endif
645 }; 651 };
646 652
647 } // namespace content 653 } // namespace content
648 654
649 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_ 655 #endif // CONTENT_PUBLIC_BROWSER_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/content_browser.gypi ('k') | content/shell/browser/shell_content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698