summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_main_loop.cc
diff options
context:
space:
mode:
authorphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-15 11:11:35 +0000
committerphoglund@chromium.org <phoglund@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-15 11:11:35 +0000
commit1a8d01dcec084ec94daf7f8adf5e7a25a66a02f6 (patch)
tree447a7a4b1091b6b3023da4cd5e34163a7364a5b2 /content/browser/browser_main_loop.cc
parent8c2614c507b95b532e3edaba22fdafd67c94234f (diff)
downloadchromium_src-1a8d01dcec084ec94daf7f8adf5e7a25a66a02f6.zip
chromium_src-1a8d01dcec084ec94daf7f8adf5e7a25a66a02f6.tar.gz
chromium_src-1a8d01dcec084ec94daf7f8adf5e7a25a66a02f6.tar.bz2
Revert 217768 "Adding key press detection in the browser process."
> Adding key press detection in the browser process. > It works like this on the browser side: > A new object KeyPressMonitor is created on BrowserMainLoop and passed to AudioInputRendererHost to pass to AudioInputController. > AudioInputController::DoRecord calls KeyPressMonitor::AddKeyPressListener --> KeyPressMonitor listens to system key events through UserInputMonitor(only implemented on Linux) --> AudioInputController::OnKeyPressed is called and sets key_pressed_ --> When AudioInputController::OnData called, it writes key_pressed_ to shared memory along with the audio data buffer. > On the renderer side a new param "key_pressed" is added through the code path of passing the flag to the webrtc voice engine. > This CL includes all these changes except the implementation of UserInputMonitor for Windows and Mac. The impl of UserInputMonitor is mostly copied from remoting/host/local_input_monitor_linux.cc > > > BUG= > > Review URL: https://chromiumcodereview.appspot.com/21183002 TBR=jiayl@chromium.org Review URL: https://codereview.chromium.org/22871007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
-rw-r--r--content/browser/browser_main_loop.cc9
1 files changed, 0 insertions, 9 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 4194aa8..c51b5c5 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -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 @@ int BrowserMainLoop::BrowserThreadsStarted() {
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;