OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
6 #define CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 6 #define CONTENT_SHELL_BROWSER_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" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 WebContents* web_contents) override; | 56 WebContents* web_contents) override; |
57 QuotaPermissionContext* CreateQuotaPermissionContext() override; | 57 QuotaPermissionContext* CreateQuotaPermissionContext() override; |
58 SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate() | 58 SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate() |
59 override; | 59 override; |
60 net::NetLog* GetNetLog() override; | 60 net::NetLog* GetNetLog() override; |
61 bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context, | 61 bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context, |
62 const GURL& current_url, | 62 const GURL& current_url, |
63 const GURL& new_url) override; | 63 const GURL& new_url) override; |
64 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; | 64 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; |
65 | 65 |
66 WebContents* OpenURL(BrowserContext* browser_context, | 66 void OpenURL(BrowserContext* browser_context, |
67 const OpenURLParams& params) override; | 67 const OpenURLParams& params, |
| 68 const base::Callback<void(WebContents*)>& callback) override; |
68 | 69 |
69 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 70 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
70 void GetAdditionalMappedFilesForChildProcess( | 71 void GetAdditionalMappedFilesForChildProcess( |
71 const base::CommandLine& command_line, | 72 const base::CommandLine& command_line, |
72 int child_process_id, | 73 int child_process_id, |
73 FileDescriptorInfo* mappings) override; | 74 FileDescriptorInfo* mappings) override; |
74 #endif | 75 #endif |
75 #if defined(OS_WIN) | 76 #if defined(OS_WIN) |
76 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, | 77 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, |
77 bool* success) override; | 78 bool* success) override; |
(...skipping 14 matching lines...) Expand all Loading... |
92 | 93 |
93 scoped_ptr<ShellResourceDispatcherHostDelegate> | 94 scoped_ptr<ShellResourceDispatcherHostDelegate> |
94 resource_dispatcher_host_delegate_; | 95 resource_dispatcher_host_delegate_; |
95 | 96 |
96 ShellBrowserMainParts* shell_browser_main_parts_; | 97 ShellBrowserMainParts* shell_browser_main_parts_; |
97 }; | 98 }; |
98 | 99 |
99 } // namespace content | 100 } // namespace content |
100 | 101 |
101 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 102 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |