Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(250)

Side by Side Diff: content/browser/browser_main_loop.h

Issue 2932893002: BrowserMainLoop owns FrameSinkManagerHost (Closed)
Patch Set: Added a comment that works everywhere Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 5 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 6 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 namespace net { 69 namespace net {
70 class NetworkChangeNotifier; 70 class NetworkChangeNotifier;
71 } // namespace net 71 } // namespace net
72 72
73 #if defined(USE_OZONE) 73 #if defined(USE_OZONE)
74 namespace gfx { 74 namespace gfx {
75 class ClientNativePixmapFactory; 75 class ClientNativePixmapFactory;
76 } // namespace gfx 76 } // namespace gfx
77 #endif 77 #endif
78 78
79 namespace viz {
80 class FrameSinkManagerHost;
81 }
82
79 namespace content { 83 namespace content {
80 class BrowserMainParts; 84 class BrowserMainParts;
81 class BrowserOnlineStateObserver; 85 class BrowserOnlineStateObserver;
82 class BrowserThreadImpl; 86 class BrowserThreadImpl;
83 class LoaderDelegateImpl; 87 class LoaderDelegateImpl;
84 class MediaStreamManager; 88 class MediaStreamManager;
85 class ResourceDispatcherHostImpl; 89 class ResourceDispatcherHostImpl;
86 class SaveFileManager; 90 class SaveFileManager;
87 class ServiceManagerContext; 91 class ServiceManagerContext;
88 class SpeechRecognitionManagerImpl; 92 class SpeechRecognitionManagerImpl;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); } 158 base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); }
155 159
156 bool is_tracing_startup_for_duration() const { 160 bool is_tracing_startup_for_duration() const {
157 return is_tracing_startup_for_duration_; 161 return is_tracing_startup_for_duration_;
158 } 162 }
159 163
160 const base::FilePath& startup_trace_file() const { 164 const base::FilePath& startup_trace_file() const {
161 return startup_trace_file_; 165 return startup_trace_file_;
162 } 166 }
163 167
168 #if !defined(OS_ANDROID)
169 // TODO(fsamuel): We should find an object to own FrameSinkManagerHost on all
170 // platforms including Android. See http://crbug.com/732507.
171 viz::FrameSinkManagerHost* frame_sink_manager_host() const {
172 return frame_sink_manager_host_.get();
173 }
174 #endif
175
164 void StopStartupTracingTimer(); 176 void StopStartupTracingTimer();
165 177
166 #if defined(OS_MACOSX) && !defined(OS_IOS) 178 #if defined(OS_MACOSX) && !defined(OS_IOS)
167 media::DeviceMonitorMac* device_monitor_mac() const { 179 media::DeviceMonitorMac* device_monitor_mac() const {
168 return device_monitor_mac_.get(); 180 return device_monitor_mac_.get();
169 } 181 }
170 #endif 182 #endif
171 183
172 private: 184 private:
173 void InitializeMainThread(); 185 void InitializeMainThread();
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 #endif 322 #endif
311 323
312 std::unique_ptr<LoaderDelegateImpl> loader_delegate_; 324 std::unique_ptr<LoaderDelegateImpl> loader_delegate_;
313 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 325 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
314 std::unique_ptr<MediaStreamManager> media_stream_manager_; 326 std::unique_ptr<MediaStreamManager> media_stream_manager_;
315 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> 327 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
316 discardable_shared_memory_manager_; 328 discardable_shared_memory_manager_;
317 scoped_refptr<SaveFileManager> save_file_manager_; 329 scoped_refptr<SaveFileManager> save_file_manager_;
318 std::unique_ptr<memory_instrumentation::CoordinatorImpl> 330 std::unique_ptr<memory_instrumentation::CoordinatorImpl>
319 memory_instrumentation_coordinator_; 331 memory_instrumentation_coordinator_;
332 #if !defined(OS_ANDROID)
333 std::unique_ptr<viz::FrameSinkManagerHost> frame_sink_manager_host_;
334 #endif
320 335
321 // DO NOT add members here. Add them to the right categories above. 336 // DO NOT add members here. Add them to the right categories above.
322 337
323 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 338 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
324 }; 339 };
325 340
326 } // namespace content 341 } // namespace content
327 342
328 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 343 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698