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 CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <memory> | 10 #include <memory> |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 void ExposeInterfacesToMediaService( | 285 void ExposeInterfacesToMediaService( |
286 service_manager::InterfaceRegistry* registry, | 286 service_manager::InterfaceRegistry* registry, |
287 content::RenderFrameHost* render_frame_host) override; | 287 content::RenderFrameHost* render_frame_host) override; |
288 void RegisterRenderFrameMojoInterfaces( | 288 void RegisterRenderFrameMojoInterfaces( |
289 service_manager::InterfaceRegistry* registry, | 289 service_manager::InterfaceRegistry* registry, |
290 content::RenderFrameHost* render_frame_host) override; | 290 content::RenderFrameHost* render_frame_host) override; |
291 void ExposeInterfacesToGpuProcess( | 291 void ExposeInterfacesToGpuProcess( |
292 service_manager::InterfaceRegistry* registry, | 292 service_manager::InterfaceRegistry* registry, |
293 content::GpuProcessHost* render_process_host) override; | 293 content::GpuProcessHost* render_process_host) override; |
294 void RegisterInProcessServices(StaticServiceMap* services) override; | 294 void RegisterInProcessServices(StaticServiceMap* services) override; |
| 295 void RegisterInProcessServices(content::BrowserContext* browser_context, |
| 296 StaticServiceMap* services) override; |
295 void RegisterOutOfProcessServices( | 297 void RegisterOutOfProcessServices( |
296 OutOfProcessServiceMap* services) override; | 298 OutOfProcessServiceMap* services) override; |
297 std::unique_ptr<base::Value> GetServiceManifestOverlay( | 299 std::unique_ptr<base::Value> GetServiceManifestOverlay( |
298 base::StringPiece name) override; | 300 base::StringPiece name) override; |
299 std::vector<content::ContentBrowserClient::ServiceManifestInfo> | 301 std::vector<content::ContentBrowserClient::ServiceManifestInfo> |
300 GetExtraServiceManifests() override; | 302 GetExtraServiceManifests() override; |
301 void OpenURL(content::BrowserContext* browser_context, | 303 void OpenURL(content::BrowserContext* browser_context, |
302 const content::OpenURLParams& params, | 304 const content::OpenURLParams& params, |
303 const base::Callback<void(content::WebContents*)>& callback) | 305 const base::Callback<void(content::WebContents*)>& callback) |
304 override; | 306 override; |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
382 // Vector of additional ChromeContentBrowserClientParts. | 384 // Vector of additional ChromeContentBrowserClientParts. |
383 // Parts are deleted in the reverse order they are added. | 385 // Parts are deleted in the reverse order they are added. |
384 std::vector<ChromeContentBrowserClientParts*> extra_parts_; | 386 std::vector<ChromeContentBrowserClientParts*> extra_parts_; |
385 | 387 |
386 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; | 388 base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_; |
387 | 389 |
388 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); | 390 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); |
389 }; | 391 }; |
390 | 392 |
391 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ | 393 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ |
OLD | NEW |