Add DeviceMonitorLinux in BrowserMainLoop.

content/browser/browser_main_loop.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 #define CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_process_sub_thread.h"
@@ skipping 26 matching lines @@
 
 namespace speech {
 class SpeechRecognitionManagerImpl;
 }
 
 namespace content {
 
 class BrowserMainParts;
 class BrowserShutdownImpl;
 class BrowserThreadImpl;
+class DevicesMonitor;

[tommi (sloooow) - chröme, 2012/07/30 11:07:04]

"devices monitor" doesn't sound right.  Even though it can monitor multiple
devices, I think we should name it DeviceMonitor.

 struct MainFunctionParams;
 class ResourceDispatcherHostImpl;
 class WebKitThread;
 
 // Implements the main browser loop stages called from BrowserMainRunner.
 // See comments in browser_main_parts.h for additional info.
 // All functions are to be called only on the UI thread unless otherwise noted.
 class BrowserMainLoop {
  public:
   explicit BrowserMainLoop(const content::MainFunctionParams& parameters);
@@ skipping 13 matching lines @@
 
   // Performs the shutdown sequence, starting with PostMainMessageLoopRun
   // through stopping threads to PostDestroyThreads.
   void ShutdownThreadsAndCleanUp();
 
   int GetResultCode() const { return result_code_; }
 
   // Can be called on any thread.
   static media::AudioManager* GetAudioManager();
   static media_stream::MediaStreamManager* GetMediaStreamManager();
+  static content::DevicesMonitor* GetDevicesMonitor();

[tommi (sloooow) - chröme, 2012/07/30 11:07:04]

Why do we need this getter?

 
  private:
   // For ShutdownThreadsAndCleanUp.
   friend class BrowserShutdownImpl;
 
   void InitializeMainThread();
 
   // Called right after the browser threads have been started.
   void BrowserThreadsStarted();
 
   void MainMessageLoopRun();
 
   // Members initialized on construction ---------------------------------------
   const content::MainFunctionParams& parameters_;
   const CommandLine& parsed_command_line_;
   int result_code_;
 
   // Members initialized in |MainMessageLoopStart()| ---------------------------
   scoped_ptr<MessageLoop> main_message_loop_;
   scoped_ptr<base::SystemMonitor> system_monitor_;
   scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_;
   scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_;
   scoped_ptr<media::AudioManager> audio_manager_;
   scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_;
   // Per-process listener for online state changes.
   scoped_ptr<BrowserOnlineStateObserver> online_state_observer_;
 #if defined(OS_WIN)
   scoped_ptr<SystemMessageWindowWin> system_message_window_;
 #endif
+  scoped_ptr<DevicesMonitor> devices_monitor_;

[tommi (sloooow) - chröme, 2012/07/30 11:07:04]

should this be in an #else?  This is for posix what SystemMessageWindowWin is
for Windows, right?

 
   // Destroy parts_ before main_message_loop_ (required) and before other
   // classes constructed in content (but after main_thread_).
   scoped_ptr<BrowserMainParts> parts_;
 
   // Members initialized in |InitializeMainThread()| ---------------------------
   // This must get destroyed before other threads that are created in parts_.
   scoped_ptr<BrowserThreadImpl> main_thread_;
 
   // Members initialized in |BrowserThreadsStarted()| --------------------------
@@ skipping 12 matching lines @@
 #if defined(OS_WIN)
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserMainLoop);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_MAIN_LOOP_H_