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

Unified Diff: content/browser/browser_main_loop.h

Issue 2589253002: Remove discardable_memory::DSMM::{Create,Get}Instance() (Closed)
Patch Set: Fix trybot Created 4 years 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 8f82a58652ba63735138e98b1fed28326e2143e6..ad6c04c557fe8bcc57f5eb3863836cf5c858a906 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -39,6 +39,10 @@ namespace device {
class TimeZoneMonitor;
}
+namespace discardable_memory {
+class DiscardableSharedMemoryManager;
+}
+
namespace media {
#if defined(OS_WIN)
class SystemMessageWindowWin;
@@ -145,6 +149,10 @@ class CONTENT_EXPORT BrowserMainLoop {
device::TimeZoneMonitor* time_zone_monitor() const {
return time_zone_monitor_.get();
}
+ discardable_memory::DiscardableSharedMemoryManager*
+ discardable_shared_memory_manager() const {
+ return discardable_shared_memory_manager_.get();
+ }
midi::MidiService* midi_service() const { return midi_service_.get(); }
base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); }
@@ -312,6 +320,8 @@ class CONTENT_EXPORT BrowserMainLoop {
std::unique_ptr<MediaStreamManager> media_stream_manager_;
std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
std::unique_ptr<device::TimeZoneMonitor> time_zone_monitor_;
+ std::unique_ptr<discardable_memory::DiscardableSharedMemoryManager>
+ discardable_shared_memory_manager_;
scoped_refptr<SaveFileManager> save_file_manager_;
// DO NOT add members here. Add them to the right categories above.
« 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