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

Side by Side Diff: chrome/renderer/prerender/prerender_webmediaplayer.cc

Issue 18123002: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "chrome/renderer/prerender/prerender_webmediaplayer.h" 5 #include "chrome/renderer/prerender/prerender_webmediaplayer.h"
6 6
7 #include "chrome/common/prerender_messages.h" 7 #include "chrome/common/prerender_messages.h"
8 #include "content/public/renderer/render_view.h" 8 #include "content/public/renderer/render_view.h"
9 #include "third_party/WebKit/public/platform/WebURL.h" 9 #include "third_party/WebKit/public/platform/WebURL.h"
10 #include "third_party/WebKit/public/web/WebMediaSource.h" 10 #include "third_party/WebKit/public/web/WebMediaSource.h"
11 #include "webkit/renderer/media/webmediaplayer_delegate.h"
12 11
13 namespace prerender { 12 namespace prerender {
14 13
15 PrerenderWebMediaPlayer::PrerenderWebMediaPlayer( 14 PrerenderWebMediaPlayer::PrerenderWebMediaPlayer(
16 content::RenderView* render_view, 15 content::RenderView* render_view,
17 WebKit::WebFrame* frame, 16 WebKit::WebFrame* frame,
18 WebKit::WebMediaPlayerClient* client, 17 WebKit::WebMediaPlayerClient* client,
19 base::WeakPtr<webkit_media::WebMediaPlayerDelegate> delegate, 18 base::WeakPtr<content::WebMediaPlayerDelegate> delegate,
20 const webkit_media::WebMediaPlayerParams& params) 19 const content::WebMediaPlayerParams& params)
21 : RenderViewObserver(render_view), 20 : RenderViewObserver(render_view),
22 WebMediaPlayerImpl(frame, client, delegate, params), 21 WebMediaPlayerImpl(frame, client, delegate, params),
23 is_prerendering_(true), 22 is_prerendering_(true),
24 url_loaded_(false), 23 url_loaded_(false),
25 cors_mode_(CORSModeUnspecified) { 24 cors_mode_(CORSModeUnspecified) {
26 } 25 }
27 26
28 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {} 27 PrerenderWebMediaPlayer::~PrerenderWebMediaPlayer() {}
29 28
30 void PrerenderWebMediaPlayer::load(const WebKit::WebURL& url, 29 void PrerenderWebMediaPlayer::load(const WebKit::WebURL& url,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 if (!url_to_load_) 74 if (!url_to_load_)
76 return; 75 return;
77 76
78 if (media_source_to_load_) 77 if (media_source_to_load_)
79 load(*url_to_load_, media_source_to_load_.release(), cors_mode_); 78 load(*url_to_load_, media_source_to_load_.release(), cors_mode_);
80 else 79 else
81 load(*url_to_load_, cors_mode_); 80 load(*url_to_load_, cors_mode_);
82 } 81 }
83 82
84 } // namespace prerender 83 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698