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

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

Issue 2589253002: Remove discardable_memory::DSMM::{Create,Get}Instance() (Closed)
Patch Set: Fix trybot Created 3 years, 12 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
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 21 matching lines...) Expand all
32 class SystemMonitor; 32 class SystemMonitor;
33 namespace trace_event { 33 namespace trace_event {
34 class TraceEventSystemStatsMonitor; 34 class TraceEventSystemStatsMonitor;
35 } // namespace trace_event 35 } // namespace trace_event
36 } // namespace base 36 } // namespace base
37 37
38 namespace device { 38 namespace device {
39 class TimeZoneMonitor; 39 class TimeZoneMonitor;
40 } 40 }
41 41
42 namespace discardable_memory {
43 class DiscardableSharedMemoryManager;
44 }
45
42 namespace media { 46 namespace media {
43 #if defined(OS_WIN) 47 #if defined(OS_WIN)
44 class SystemMessageWindowWin; 48 class SystemMessageWindowWin;
45 #elif defined(OS_LINUX) && defined(USE_UDEV) 49 #elif defined(OS_LINUX) && defined(USE_UDEV)
46 class DeviceMonitorLinux; 50 class DeviceMonitorLinux;
47 #endif 51 #endif
48 class UserInputMonitor; 52 class UserInputMonitor;
49 #if defined(OS_MACOSX) 53 #if defined(OS_MACOSX)
50 class DeviceMonitorMac; 54 class DeviceMonitorMac;
51 #endif 55 #endif
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 media::AudioManager* audio_manager() const { return audio_manager_.get(); } 142 media::AudioManager* audio_manager() const { return audio_manager_.get(); }
139 MediaStreamManager* media_stream_manager() const { 143 MediaStreamManager* media_stream_manager() const {
140 return media_stream_manager_.get(); 144 return media_stream_manager_.get();
141 } 145 }
142 media::UserInputMonitor* user_input_monitor() const { 146 media::UserInputMonitor* user_input_monitor() const {
143 return user_input_monitor_.get(); 147 return user_input_monitor_.get();
144 } 148 }
145 device::TimeZoneMonitor* time_zone_monitor() const { 149 device::TimeZoneMonitor* time_zone_monitor() const {
146 return time_zone_monitor_.get(); 150 return time_zone_monitor_.get();
147 } 151 }
152 discardable_memory::DiscardableSharedMemoryManager*
153 discardable_shared_memory_manager() const {
154 return discardable_shared_memory_manager_.get();
155 }
148 midi::MidiService* midi_service() const { return midi_service_.get(); } 156 midi::MidiService* midi_service() const { return midi_service_.get(); }
149 base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); } 157 base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); }
150 158
151 bool is_tracing_startup_for_duration() const { 159 bool is_tracing_startup_for_duration() const {
152 return is_tracing_startup_for_duration_; 160 return is_tracing_startup_for_duration_;
153 } 161 }
154 162
155 const base::FilePath& startup_trace_file() const { 163 const base::FilePath& startup_trace_file() const {
156 return startup_trace_file_; 164 return startup_trace_file_;
157 } 165 }
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 #endif 313 #endif
306 #if defined(USE_OZONE) 314 #if defined(USE_OZONE)
307 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_; 315 std::unique_ptr<ui::ClientNativePixmapFactory> client_native_pixmap_factory_;
308 #endif 316 #endif
309 317
310 std::unique_ptr<LoaderDelegateImpl> loader_delegate_; 318 std::unique_ptr<LoaderDelegateImpl> loader_delegate_;
311 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_; 319 std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
312 std::unique_ptr<MediaStreamManager> media_stream_manager_; 320 std::unique_ptr<MediaStreamManager> media_stream_manager_;
313 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_; 321 std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
314 std::unique_ptr<device::TimeZoneMonitor> time_zone_monitor_; 322 std::unique_ptr<device::TimeZoneMonitor> time_zone_monitor_;
323 std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
324 discardable_shared_memory_manager_;
315 scoped_refptr<SaveFileManager> save_file_manager_; 325 scoped_refptr<SaveFileManager> save_file_manager_;
316 326
317 // DO NOT add members here. Add them to the right categories above. 327 // DO NOT add members here. Add them to the right categories above.
318 328
319 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop); 329 DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
320 }; 330 };
321 331
322 } // namespace content 332 } // namespace content
323 333
324 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_ 334 #endif // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
OLDNEW
« no previous file with comments | « components/discardable_memory/service/discardable_shared_memory_manager.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698