| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "content/public/browser/content_browser_client.h" | 9 #include "content/public/browser/content_browser_client.h" |
| 10 | 10 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 content::SpeechRecognitionManagerDelegate* | 55 content::SpeechRecognitionManagerDelegate* |
| 56 CreateSpeechRecognitionManagerDelegate() override; | 56 CreateSpeechRecognitionManagerDelegate() override; |
| 57 content::BrowserPpapiHost* GetExternalBrowserPpapiHost( | 57 content::BrowserPpapiHost* GetExternalBrowserPpapiHost( |
| 58 int plugin_process_id) override; | 58 int plugin_process_id) override; |
| 59 void GetAdditionalAllowedSchemesForFileSystem( | 59 void GetAdditionalAllowedSchemesForFileSystem( |
| 60 std::vector<std::string>* additional_schemes) override; | 60 std::vector<std::string>* additional_schemes) override; |
| 61 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 61 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 62 void GetAdditionalMappedFilesForChildProcess( | 62 void GetAdditionalMappedFilesForChildProcess( |
| 63 const base::CommandLine& command_line, | 63 const base::CommandLine& command_line, |
| 64 int child_process_id, | 64 int child_process_id, |
| 65 content::FileDescriptorInfo* mappings) override; | 65 content::FileDescriptorInfo* mappings |
| 66 #if defined(OS_ANDROID) |
| 67 , |
| 68 std::map<int, base::MemoryMappedFile::Region>* regions |
| 69 #endif |
| 70 ) override; |
| 66 #endif | 71 #endif |
| 67 | 72 |
| 68 content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; | 73 content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; |
| 69 | 74 |
| 70 protected: | 75 protected: |
| 71 // Subclasses may wish to provide their own ShellBrowserMainParts. | 76 // Subclasses may wish to provide their own ShellBrowserMainParts. |
| 72 virtual ShellBrowserMainParts* CreateShellBrowserMainParts( | 77 virtual ShellBrowserMainParts* CreateShellBrowserMainParts( |
| 73 const content::MainFunctionParams& parameters, | 78 const content::MainFunctionParams& parameters, |
| 74 ShellBrowserMainDelegate* browser_main_delegate); | 79 ShellBrowserMainDelegate* browser_main_delegate); |
| 75 | 80 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 90 | 95 |
| 91 // Owned by ShellBrowserMainParts. | 96 // Owned by ShellBrowserMainParts. |
| 92 ShellBrowserMainDelegate* browser_main_delegate_; | 97 ShellBrowserMainDelegate* browser_main_delegate_; |
| 93 | 98 |
| 94 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); | 99 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); |
| 95 }; | 100 }; |
| 96 | 101 |
| 97 } // namespace extensions | 102 } // namespace extensions |
| 98 | 103 |
| 99 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 104 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
| OLD | NEW |