diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
| commit | 23730a6e56a168d1879203e4b3819bb36e3d8f1f (patch) | |
| tree | 4b72bdd217f9beda1d1b975e21c9d646a9664c48 /media/base/user_input_monitor_win.cc | |
| parent | 6d6d338a36340632714f2aab9a266979b71c3442 (diff) | |
| download | chromium_org-23730a6e56a168d1879203e4b3819bb36e3d8f1f.tar.gz | |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
Diffstat (limited to 'media/base/user_input_monitor_win.cc')
| -rw-r--r-- | media/base/user_input_monitor_win.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc index 29cedc8b63..e9340d8283 100644 --- a/media/base/user_input_monitor_win.cc +++ b/media/base/user_input_monitor_win.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" -#include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h" #include "base/strings/stringprintf.h" |