| 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 21 matching lines...) Expand all Loading... |
| 43 #if defined(OS_ANDROID) | 44 #if defined(OS_ANDROID) |
| 44 , std::map<int, base::MemoryMappedFile::Region>* regions | 45 , std::map<int, base::MemoryMappedFile::Region>* regions |
| 45 #endif | 46 #endif |
| 46 ) override; | 47 ) override; |
| 47 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 48 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
| 48 | 49 |
| 49 content::ShellBrowserContext* browser_context(); | 50 content::ShellBrowserContext* browser_context(); |
| 50 | 51 |
| 51 private: | 52 private: |
| 52 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 53 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 53 bool natives_fd_exists() { return v8_natives_fd_.is_valid(); } | 54 gin::V8Initializer::V8Files v8_files_; |
| 54 bool snapshot_fd_exists() { return v8_snapshot_fd_.is_valid(); } | |
| 55 | |
| 56 base::ScopedFD v8_natives_fd_; | |
| 57 base::ScopedFD v8_snapshot_fd_; | |
| 58 #endif | 55 #endif |
| 59 | 56 |
| 60 ShellBrowserMainParts* shell_browser_main_parts_; | 57 ShellBrowserMainParts* shell_browser_main_parts_; |
| 61 | 58 |
| 62 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); | 59 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); |
| 63 }; | 60 }; |
| 64 | 61 |
| 65 } // namespace shell | 62 } // namespace shell |
| 66 } // namespace ash | 63 } // namespace ash |
| 67 | 64 |
| 68 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ | 65 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |