| Index: content/browser/browser_main_loop.h
|
| diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
|
| index be9196b5241b01ecc8ac7e724b65c9ff7a5effc3..5cdf3051723bb1b897028d9eef3127c0dbe5a854 100644
|
| --- a/content/browser/browser_main_loop.h
|
| +++ b/content/browser/browser_main_loop.h
|
| @@ -76,6 +76,10 @@ class ClientNativePixmapFactory;
|
| } // namespace gfx
|
| #endif
|
|
|
| +namespace viz {
|
| +class FrameSinkManagerHost;
|
| +}
|
| +
|
| namespace content {
|
| class BrowserMainParts;
|
| class BrowserOnlineStateObserver;
|
| @@ -161,6 +165,14 @@ class CONTENT_EXPORT BrowserMainLoop {
|
| return startup_trace_file_;
|
| }
|
|
|
| +#if !defined(OS_ANDROID)
|
| + // TODO(fsamuel): We should find an object to own FrameSinkManagerHost on all
|
| + // platforms including Android. See http://crbug.com/732507.
|
| + viz::FrameSinkManagerHost* frame_sink_manager_host() const {
|
| + return frame_sink_manager_host_.get();
|
| + }
|
| +#endif
|
| +
|
| void StopStartupTracingTimer();
|
|
|
| #if defined(OS_MACOSX) && !defined(OS_IOS)
|
| @@ -317,6 +329,9 @@ class CONTENT_EXPORT BrowserMainLoop {
|
| scoped_refptr<SaveFileManager> save_file_manager_;
|
| std::unique_ptr<memory_instrumentation::CoordinatorImpl>
|
| memory_instrumentation_coordinator_;
|
| +#if !defined(OS_ANDROID)
|
| + std::unique_ptr<viz::FrameSinkManagerHost> frame_sink_manager_host_;
|
| +#endif
|
|
|
| // DO NOT add members here. Add them to the right categories above.
|
|
|
|
|