| 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 25 matching lines...) Expand all Loading... |
| 36 } // namespace base | 36 } // namespace base |
| 37 | 37 |
| 38 namespace cc { | 38 namespace cc { |
| 39 class SurfaceManager; | 39 class SurfaceManager; |
| 40 } | 40 } |
| 41 | 41 |
| 42 namespace discardable_memory { | 42 namespace discardable_memory { |
| 43 class DiscardableSharedMemoryManager; | 43 class DiscardableSharedMemoryManager; |
| 44 } | 44 } |
| 45 | 45 |
| 46 namespace gpu { |
| 47 class GpuChannelEstablishFactory; |
| 48 } |
| 49 |
| 46 namespace media { | 50 namespace media { |
| 47 class AudioManager; | 51 class AudioManager; |
| 48 class AudioSystem; | 52 class AudioSystem; |
| 49 #if defined(OS_WIN) | 53 #if defined(OS_WIN) |
| 50 class SystemMessageWindowWin; | 54 class SystemMessageWindowWin; |
| 51 #elif defined(OS_LINUX) && defined(USE_UDEV) | 55 #elif defined(OS_LINUX) && defined(USE_UDEV) |
| 52 class DeviceMonitorLinux; | 56 class DeviceMonitorLinux; |
| 53 #endif | 57 #endif |
| 54 class UserInputMonitor; | 58 class UserInputMonitor; |
| 55 #if defined(OS_MACOSX) | 59 #if defined(OS_MACOSX) |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 midi::MidiService* midi_service() const { return midi_service_.get(); } | 167 midi::MidiService* midi_service() const { return midi_service_.get(); } |
| 164 | 168 |
| 165 bool is_tracing_startup_for_duration() const { | 169 bool is_tracing_startup_for_duration() const { |
| 166 return is_tracing_startup_for_duration_; | 170 return is_tracing_startup_for_duration_; |
| 167 } | 171 } |
| 168 | 172 |
| 169 const base::FilePath& startup_trace_file() const { | 173 const base::FilePath& startup_trace_file() const { |
| 170 return startup_trace_file_; | 174 return startup_trace_file_; |
| 171 } | 175 } |
| 172 | 176 |
| 177 gpu::GpuChannelEstablishFactory* gpu_channel_establish_factory() const; |
| 178 |
| 173 #if defined(OS_ANDROID) | 179 #if defined(OS_ANDROID) |
| 174 void SynchronouslyFlushStartupTasks(); | 180 void SynchronouslyFlushStartupTasks(); |
| 175 #endif // OS_ANDROID | 181 #endif // OS_ANDROID |
| 176 | 182 |
| 177 #if !defined(OS_ANDROID) | 183 #if !defined(OS_ANDROID) |
| 178 // TODO(fsamuel): We should find an object to own HostFrameSinkManager on all | 184 // TODO(fsamuel): We should find an object to own HostFrameSinkManager on all |
| 179 // platforms including Android. See http://crbug.com/732507. | 185 // platforms including Android. See http://crbug.com/732507. |
| 180 viz::HostFrameSinkManager* host_frame_sink_manager() const { | 186 viz::HostFrameSinkManager* host_frame_sink_manager() const { |
| 181 return host_frame_sink_manager_.get(); | 187 return host_frame_sink_manager_.get(); |
| 182 } | 188 } |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 #endif | 366 #endif |
| 361 | 367 |
| 362 // DO NOT add members here. Add them to the right categories above. | 368 // DO NOT add members here. Add them to the right categories above. |
| 363 | 369 |
| 364 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); | 370 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); |
| 365 }; | 371 }; |
| 366 | 372 |
| 367 } // namespace content | 373 } // namespace content |
| 368 | 374 |
| 369 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ | 375 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ |
| OLD | NEW |