Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Side by Side Diff: webkit/renderer/media/webmediaplayer_ms.h

Issue 18191004: webkit: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync+rebase Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/renderer/media/webmediaplayer_impl.h ('k') | webkit/support/platform_support_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 5 #ifndef WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
6 #define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 6 #define WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
7 7
8 #include "base/memory/ref_counted.h" 8 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "base/synchronization/lock.h" 11 #include "base/synchronization/lock.h"
12 #include "cc/layers/video_frame_provider.h" 12 #include "cc/layers/video_frame_provider.h"
13 #include "googleurl/src/gurl.h"
14 #include "media/filters/skcanvas_video_renderer.h" 13 #include "media/filters/skcanvas_video_renderer.h"
15 #include "skia/ext/platform_canvas.h" 14 #include "skia/ext/platform_canvas.h"
16 #include "third_party/WebKit/public/web/WebMediaPlayer.h" 15 #include "third_party/WebKit/public/web/WebMediaPlayer.h"
16 #include "url/gurl.h"
17 17
18 namespace WebKit { 18 namespace WebKit {
19 class WebFrame; 19 class WebFrame;
20 class WebMediaPlayerClient; 20 class WebMediaPlayerClient;
21 } 21 }
22 22
23 namespace media { 23 namespace media {
24 class MediaLog; 24 class MediaLog;
25 } 25 }
26 26
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_; 183 scoped_refptr<MediaStreamAudioRenderer> audio_renderer_;
184 184
185 scoped_refptr<media::MediaLog> media_log_; 185 scoped_refptr<media::MediaLog> media_log_;
186 186
187 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS); 187 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerMS);
188 }; 188 };
189 189
190 } // namespace webkit_media 190 } // namespace webkit_media
191 191
192 #endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_ 192 #endif // WEBKIT_RENDERER_MEDIA_WEBMEDIAPLAYER_MS_H_
OLDNEW
« no previous file with comments | « webkit/renderer/media/webmediaplayer_impl.h ('k') | webkit/support/platform_support_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698