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;
+#if defined(OS_LINUX)

[jam, 2012/07/31 15:46:05]

nit: can you move this after the class/struct section, so that the ifdef'd parts
are at the end (i.e. just like how we put includes inside ifdefs after the rest
of the other includes). also while you're at it, move the struct below after the
class WebKitThread

[wjia(left Chromium), 2012/07/31 18:19:08]

Done.

+class DeviceMonitorLinux;
+#endif
 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 41 matching lines @@
   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_;
+#elif defined(OS_LINUX)
+  scoped_ptr<DeviceMonitorLinux> device_monitor_linux_;
 #endif
 
   // 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_;
 
@@ skipping 13 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_