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" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
13 #include "base/timer/timer.h" | 13 #include "base/timer/timer.h" |
14 #include "build/build_config.h" | 14 #include "build/build_config.h" |
15 #include "content/browser/browser_process_sub_thread.h" | 15 #include "content/browser/browser_process_sub_thread.h" |
16 #include "content/public/browser/browser_main_runner.h" | 16 #include "content/public/browser/browser_main_runner.h" |
17 #include "media/audio/audio_manager.h" | 17 #include "media/audio/audio_manager.h" |
| 18 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" |
18 | 19 |
19 #if defined(USE_AURA) | 20 #if defined(USE_AURA) |
20 namespace aura { | 21 namespace aura { |
21 class Env; | 22 class Env; |
22 } | 23 } |
23 #endif | 24 #endif |
24 | 25 |
25 namespace base { | 26 namespace base { |
26 class CommandLine; | 27 class CommandLine; |
27 class FilePath; | 28 class FilePath; |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
314 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; | 315 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; |
315 #endif | 316 #endif |
316 | 317 |
317 std::unique_ptr<LoaderDelegateImpl> loader_delegate_; | 318 std::unique_ptr<LoaderDelegateImpl> loader_delegate_; |
318 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; | 319 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; |
319 std::unique_ptr<MediaStreamManager> media_stream_manager_; | 320 std::unique_ptr<MediaStreamManager> media_stream_manager_; |
320 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_; | 321 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_; |
321 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> | 322 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager> |
322 discardable_shared_memory_manager_; | 323 discardable_shared_memory_manager_; |
323 scoped_refptr<SaveFileManager> save_file_manager_; | 324 scoped_refptr<SaveFileManager> save_file_manager_; |
| 325 std::unique_ptr<memory_instrumentation::CoordinatorImpl> |
| 326 memory_instrumentation_coordinator_; |
324 | 327 |
325 // DO NOT add members here. Add them to the right categories above. | 328 // DO NOT add members here. Add them to the right categories above. |
326 | 329 |
327 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); | 330 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); |
328 }; | 331 }; |
329 | 332 |
330 } // namespace content | 333 } // namespace content |
331 | 334 |
332 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ | 335 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ |
OLD | NEW |