Chromium Code Reviews| 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 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 Loading... | |
| 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 Loading... | |
| 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) | |
|
piman
2017/06/12 19:14:41
nit: Could you file a bug with the breadcrumbs you
Fady Samuel
2017/06/12 19:54:21
https://bugs.chromium.org/p/chromium/issues/detail
| |
| 169 viz::FrameSinkManagerHost* frame_sink_manager_host() const { | |
| 170 return frame_sink_manager_host_.get(); | |
| 171 } | |
| 172 #endif | |
| 173 | |
| 164 void StopStartupTracingTimer(); | 174 void StopStartupTracingTimer(); |
| 165 | 175 |
| 166 #if defined(OS_MACOSX) && !defined(OS_IOS) | 176 #if defined(OS_MACOSX) && !defined(OS_IOS) |
| 167 media::DeviceMonitorMac* device_monitor_mac() const { | 177 media::DeviceMonitorMac* device_monitor_mac() const { |
| 168 return device_monitor_mac_.get(); | 178 return device_monitor_mac_.get(); |
| 169 } | 179 } |
| 170 #endif | 180 #endif |
| 171 | 181 |
| 172 private: | 182 private: |
| 173 void InitializeMainThread(); | 183 void InitializeMainThread(); |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 310 #endif | 320 #endif |
| 311 | 321 |
| 312 std::unique_ptr<LoaderDelegateImpl> loader_delegate_; | 322 std::unique_ptr<LoaderDelegateImpl> loader_delegate_; |
| 313 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; | 323 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; |
| 314 std::unique_ptr<MediaStreamManager> media_stream_manager_; | 324 std::unique_ptr<MediaStreamManager> media_stream_manager_; |
| 315 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> | 325 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> |
| 316 discardable_shared_memory_manager_; | 326 discardable_shared_memory_manager_; |
| 317 scoped_refptr<SaveFileManager> save_file_manager_; | 327 scoped_refptr<SaveFileManager> save_file_manager_; |
| 318 std::unique_ptr<memory_instrumentation::CoordinatorImpl> | 328 std::unique_ptr<memory_instrumentation::CoordinatorImpl> |
| 319 memory_instrumentation_coordinator_; | 329 memory_instrumentation_coordinator_; |
| 330 #if !defined(OS_ANDROID) | |
| 331 std::unique_ptr<viz::FrameSinkManagerHost> frame_sink_manager_host_; | |
| 332 #endif | |
| 320 | 333 |
| 321 // DO NOT add members here. Add them to the right categories above. | 334 // DO NOT add members here. Add them to the right categories above. |
| 322 | 335 |
| 323 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); | 336 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); |
| 324 }; | 337 }; |
| 325 | 338 |
| 326 } // namespace content | 339 } // namespace content |
| 327 | 340 |
| 328 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ | 341 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ |
| OLD | NEW |