| Index: chrome/browser/chrome_content_browser_client.h
|
| diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
|
| index 6f0fad48071b6b0fb35d3531bad3ff2ebeae9319..4a17eb630972fe230f7e9158e062819420ede0ec 100644
|
| --- a/chrome/browser/chrome_content_browser_client.h
|
| +++ b/chrome/browser/chrome_content_browser_client.h
|
| @@ -207,7 +207,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| #if defined(OS_POSIX) && !defined(OS_MACOSX)
|
| virtual void GetAdditionalMappedFilesForChildProcess(
|
| const CommandLine& command_line,
|
| - base::GlobalDescriptors::Mapping* mappings) OVERRIDE;
|
| + std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
|
| #endif
|
| #if defined(OS_WIN)
|
| virtual const wchar_t* GetResourceDllName() OVERRIDE;
|
|
|