| Index: trunk/src/content/browser/browser_main_loop.cc
|
| ===================================================================
|
| --- trunk/src/content/browser/browser_main_loop.cc (revision 217773)
|
| +++ trunk/src/content/browser/browser_main_loop.cc (working copy)
|
| @@ -52,7 +52,6 @@
|
| #include "crypto/nss_util.h"
|
| #include "media/audio/audio_manager.h"
|
| #include "media/base/media.h"
|
| -#include "media/base/user_input_monitor.h"
|
| #include "media/midi/midi_manager.h"
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/socket/client_socket_factory.h"
|
| @@ -873,14 +872,6 @@
|
| audio_manager_.get(), media_stream_manager_.get()));
|
| }
|
|
|
| - {
|
| - TRACE_EVENT0(
|
| - "startup",
|
| - "BrowserMainLoop::BrowserThreadsStarted::InitUserInputMonitor");
|
| - user_input_monitor_ = media::UserInputMonitor::Create(
|
| - io_thread_->message_loop_proxy(), main_thread_->message_loop_proxy());
|
| - }
|
| -
|
| // Alert the clipboard class to which threads are allowed to access the
|
| // clipboard:
|
| std::vector<base::PlatformThreadId> allowed_clipboard_threads;
|
|
|