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

Side by Side Diff: content/renderer/media/webmediaplayer_impl.h

Issue 301933002: Changing default_url to destination_url for consistency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removing nit Created 6 years, 6 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
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 CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 void OnPipelineError(media::PipelineStatus error); 170 void OnPipelineError(media::PipelineStatus error);
171 void OnPipelineMetadata(media::PipelineMetadata metadata); 171 void OnPipelineMetadata(media::PipelineMetadata metadata);
172 void OnPipelinePrerollCompleted(); 172 void OnPipelinePrerollCompleted();
173 void OnDemuxerOpened(); 173 void OnDemuxerOpened();
174 void OnKeyAdded(const std::string& session_id); 174 void OnKeyAdded(const std::string& session_id);
175 void OnKeyError(const std::string& session_id, 175 void OnKeyError(const std::string& session_id,
176 media::MediaKeys::KeyError error_code, 176 media::MediaKeys::KeyError error_code,
177 uint32 system_code); 177 uint32 system_code);
178 void OnKeyMessage(const std::string& session_id, 178 void OnKeyMessage(const std::string& session_id,
179 const std::vector<uint8>& message, 179 const std::vector<uint8>& message,
180 const std::string& default_url); 180 const GURL& destination_url);
181 void OnNeedKey(const std::string& type, 181 void OnNeedKey(const std::string& type,
182 const std::vector<uint8>& init_data); 182 const std::vector<uint8>& init_data);
183 void OnAddTextTrack(const media::TextTrackConfig& config, 183 void OnAddTextTrack(const media::TextTrackConfig& config,
184 const media::AddTextTrackDoneCB& done_cb); 184 const media::AddTextTrackDoneCB& done_cb);
185 185
186 private: 186 private:
187 // Called after |defer_load_cb_| has decided to allow the load. If 187 // Called after |defer_load_cb_| has decided to allow the load. If
188 // |defer_load_cb_| is null this is called immediately. 188 // |defer_load_cb_| is null this is called immediately.
189 void DoLoad(LoadType load_type, 189 void DoLoad(LoadType load_type,
190 const blink::WebURL& url, 190 const blink::WebURL& url,
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 WebContentDecryptionModuleImpl* web_cdm_; 351 WebContentDecryptionModuleImpl* web_cdm_;
352 352
353 media::DecryptorReadyCB decryptor_ready_cb_; 353 media::DecryptorReadyCB decryptor_ready_cb_;
354 354
355 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 355 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
356 }; 356 };
357 357
358 } // namespace content 358 } // namespace content
359 359
360 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 360 #endif // CONTENT_RENDERER_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/crypto/proxy_decryptor.cc ('k') | content/renderer/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698