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 <memory> | 8 #include <memory> |
9 #include <string> | 9 #include <string> |
| 10 #include <utility> |
10 | 11 |
11 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
12 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "content/public/browser/content_browser_client.h" | 15 #include "content/public/browser/content_browser_client.h" |
15 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" | 16 #include "content/shell/browser/shell_resource_dispatcher_host_delegate.h" |
16 #include "content/shell/browser/shell_speech_recognition_manager_delegate.h" | 17 #include "content/shell/browser/shell_speech_recognition_manager_delegate.h" |
17 #include "services/service_manager/public/cpp/binder_registry.h" | 18 #include "services/service_manager/public/cpp/binder_registry.h" |
18 | 19 |
19 namespace content { | 20 namespace content { |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 content::StoragePartition* partition, | 59 content::StoragePartition* partition, |
59 storage::OptionalQuotaSettingsCallback callback) override; | 60 storage::OptionalQuotaSettingsCallback callback) override; |
60 void SelectClientCertificate( | 61 void SelectClientCertificate( |
61 WebContents* web_contents, | 62 WebContents* web_contents, |
62 net::SSLCertRequestInfo* cert_request_info, | 63 net::SSLCertRequestInfo* cert_request_info, |
63 net::ClientCertIdentityList client_certs, | 64 net::ClientCertIdentityList client_certs, |
64 std::unique_ptr<ClientCertificateDelegate> delegate) override; | 65 std::unique_ptr<ClientCertificateDelegate> delegate) override; |
65 SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate() | 66 SpeechRecognitionManagerDelegate* CreateSpeechRecognitionManagerDelegate() |
66 override; | 67 override; |
67 net::NetLog* GetNetLog() override; | 68 net::NetLog* GetNetLog() override; |
| 69 bool ShouldIsolateFrameFromMainContent( |
| 70 content::RenderFrameHost* frame, |
| 71 const GURL& dest_url, |
| 72 content::SiteInstance* main_frame_site_instance) override; |
68 bool ShouldSwapProcessesForRedirect(BrowserContext* browser_context, | 73 bool ShouldSwapProcessesForRedirect(BrowserContext* browser_context, |
69 const GURL& current_url, | 74 const GURL& current_url, |
70 const GURL& new_url) override; | 75 const GURL& new_url) override; |
71 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; | 76 DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; |
72 | 77 |
73 void OpenURL(BrowserContext* browser_context, | 78 void OpenURL(BrowserContext* browser_context, |
74 const OpenURLParams& params, | 79 const OpenURLParams& params, |
75 const base::Callback<void(WebContents*)>& callback) override; | 80 const base::Callback<void(WebContents*)>& callback) override; |
76 | 81 |
77 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 82 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 | 122 |
118 service_manager::BinderRegistryWithParams<content::RenderFrameHost*> | 123 service_manager::BinderRegistryWithParams<content::RenderFrameHost*> |
119 frame_interfaces_; | 124 frame_interfaces_; |
120 | 125 |
121 ShellBrowserMainParts* shell_browser_main_parts_; | 126 ShellBrowserMainParts* shell_browser_main_parts_; |
122 }; | 127 }; |
123 | 128 |
124 } // namespace content | 129 } // namespace content |
125 | 130 |
126 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ | 131 #endif // CONTENT_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |