| OLD | NEW |
| 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 ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ | 6 #define ASH_SHELL_CONTENT_CLIENT_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" |
| 11 #include "content/public/browser/content_browser_client.h" | 11 #include "content/public/browser/content_browser_client.h" |
| 12 #include "gin/v8_initializer.h" |
| 12 | 13 |
| 13 namespace content { | 14 namespace content { |
| 14 class ShellBrowserContext; | 15 class ShellBrowserContext; |
| 15 class ShellBrowserMainParts; | 16 class ShellBrowserMainParts; |
| 16 class ShellResourceDispatcherHostDelegate; | 17 class ShellResourceDispatcherHostDelegate; |
| 17 } | 18 } |
| 18 | 19 |
| 19 namespace ash { | 20 namespace ash { |
| 20 namespace shell { | 21 namespace shell { |
| 21 | 22 |
| (...skipping 17 matching lines...) Expand all Loading... |
| 39 void GetAdditionalMappedFilesForChildProcess( | 40 void GetAdditionalMappedFilesForChildProcess( |
| 40 const base::CommandLine& command_line, | 41 const base::CommandLine& command_line, |
| 41 int child_process_id, | 42 int child_process_id, |
| 42 content::FileDescriptorInfo* mappings) override; | 43 content::FileDescriptorInfo* mappings) override; |
| 43 #endif | 44 #endif |
| 44 | 45 |
| 45 content::ShellBrowserContext* browser_context(); | 46 content::ShellBrowserContext* browser_context(); |
| 46 | 47 |
| 47 private: | 48 private: |
| 48 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 49 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 49 base::ScopedFD v8_natives_fd_; | 50 gin::V8Initializer::V8Files v8_files_; |
| 50 base::ScopedFD v8_snapshot_fd_; | |
| 51 #endif | 51 #endif |
| 52 | 52 |
| 53 ShellBrowserMainParts* shell_browser_main_parts_; | 53 ShellBrowserMainParts* shell_browser_main_parts_; |
| 54 | 54 |
| 55 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); | 55 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); |
| 56 }; | 56 }; |
| 57 | 57 |
| 58 } // namespace shell | 58 } // namespace shell |
| 59 } // namespace ash | 59 } // namespace ash |
| 60 | 60 |
| 61 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ | 61 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |