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

Unified Diff: content/browser/browser_main_loop.h

Issue 2589493006: Revert of Enable connection to Mojo services from Blink (Closed)
Patch Set: 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
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.h
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index b0a8798bfe42e265e7c0680885b48c5675559cbe..8f82a58652ba63735138e98b1fed28326e2143e6 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -34,6 +34,10 @@
class TraceEventSystemStatsMonitor;
} // namespace trace_event
} // namespace base
+
+namespace device {
+class TimeZoneMonitor;
+}
namespace media {
#if defined(OS_WIN)
@@ -137,6 +141,9 @@
}
media::UserInputMonitor* user_input_monitor() const {
return user_input_monitor_.get();
+ }
+ device::TimeZoneMonitor* time_zone_monitor() const {
+ return time_zone_monitor_.get();
}
midi::MidiService* midi_service() const { return midi_service_.get(); }
base::Thread* indexed_db_thread() const { return indexed_db_thread_.get(); }
@@ -304,6 +311,7 @@
std::unique_ptr<ResourceDispatcherHostImpl> resource_dispatcher_host_;
std::unique_ptr<MediaStreamManager> media_stream_manager_;
std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
+ std::unique_ptr<device::TimeZoneMonitor> time_zone_monitor_;
scoped_refptr<SaveFileManager> save_file_manager_;
// DO NOT add members here. Add them to the right categories above.
« no previous file with comments | « content/browser/browser_context.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698