summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.gyp2
-rw-r--r--chrome/renderer/webmediaplayer_impl.cc1
-rw-r--r--chrome/renderer/webmediaplayer_impl.h2
3 files changed, 1 insertions, 4 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 8b390f4..c12d613 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1694,8 +1694,6 @@
'renderer/media/audio_renderer_impl.h',
'renderer/media/buffered_data_source.cc',
'renderer/media/buffered_data_source.h',
- 'renderer/media/data_source_impl.cc',
- 'renderer/media/data_source_impl.h',
'renderer/media/simple_data_source.cc',
'renderer/media/simple_data_source.h',
'renderer/media/video_renderer_impl.cc',
diff --git a/chrome/renderer/webmediaplayer_impl.cc b/chrome/renderer/webmediaplayer_impl.cc
index 6966479..7e78eaa 100644
--- a/chrome/renderer/webmediaplayer_impl.cc
+++ b/chrome/renderer/webmediaplayer_impl.cc
@@ -7,7 +7,6 @@
#include "base/command_line.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/renderer/media/audio_renderer_impl.h"
-#include "chrome/renderer/media/data_source_impl.h"
#include "chrome/renderer/media/buffered_data_source.h"
#include "chrome/renderer/media/simple_data_source.h"
#include "chrome/renderer/media/video_renderer_impl.h"
diff --git a/chrome/renderer/webmediaplayer_impl.h b/chrome/renderer/webmediaplayer_impl.h
index 12c675f..3e263d5 100644
--- a/chrome/renderer/webmediaplayer_impl.h
+++ b/chrome/renderer/webmediaplayer_impl.h
@@ -171,7 +171,7 @@ class WebMediaPlayerImpl : public WebKit::WebMediaPlayer,
// Message loops for posting tasks between Chrome's main thread. Also used
// for DCHECKs so methods calls won't execute in the wrong thread.
- MessageLoop* |main_loop_|;
+ MessageLoop* main_loop_;
// A collection of factories for creating filters.
scoped_refptr<media::FilterFactoryCollection> filter_factory_;