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

Side by Side Diff: content/renderer/media/android/media_info_loader.h

Issue 18261007: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win64 AGAIN 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 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_ANDROID_MEDIA_INFO_LOADER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "content/common/content_export.h" 13 #include "content/common/content_export.h"
14 #include "content/renderer/media/active_loader.h"
14 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h" 15 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
15 #include "third_party/WebKit/public/web/WebMediaPlayer.h" 16 #include "third_party/WebKit/public/web/WebMediaPlayer.h"
16 #include "url/gurl.h" 17 #include "url/gurl.h"
17 #include "webkit/renderer/media/active_loader.h"
18 18
19 namespace WebKit { 19 namespace WebKit {
20 class WebFrame; 20 class WebFrame;
21 class WebURLLoader; 21 class WebURLLoader;
22 class WebURLRequest; 22 class WebURLRequest;
23 } 23 }
24 24
25 namespace content { 25 namespace content {
26 26
27 // This class provides additional information about a media URL. Currently it 27 // This class provides additional information about a media URL. Currently it
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 virtual void didFail( 98 virtual void didFail(
99 WebKit::WebURLLoader* loader, 99 WebKit::WebURLLoader* loader,
100 const WebKit::WebURLError&); 100 const WebKit::WebURLError&);
101 101
102 void DidBecomeReady(Status status); 102 void DidBecomeReady(Status status);
103 103
104 // Injected WebURLLoader instance for testing purposes. 104 // Injected WebURLLoader instance for testing purposes.
105 scoped_ptr<WebKit::WebURLLoader> test_loader_; 105 scoped_ptr<WebKit::WebURLLoader> test_loader_;
106 106
107 // Keeps track of an active WebURLLoader and associated state. 107 // Keeps track of an active WebURLLoader and associated state.
108 scoped_ptr<webkit_media::ActiveLoader> active_loader_; 108 scoped_ptr<ActiveLoader> active_loader_;
109 109
110 bool loader_failed_; 110 bool loader_failed_;
111 GURL url_; 111 GURL url_;
112 WebKit::WebMediaPlayer::CORSMode cors_mode_; 112 WebKit::WebMediaPlayer::CORSMode cors_mode_;
113 bool single_origin_; 113 bool single_origin_;
114 114
115 ReadyCB ready_cb_; 115 ReadyCB ready_cb_;
116 base::TimeTicks start_time_; 116 base::TimeTicks start_time_;
117 117
118 DISALLOW_COPY_AND_ASSIGN(MediaInfoLoader); 118 DISALLOW_COPY_AND_ASSIGN(MediaInfoLoader);
119 }; 119 };
120 120
121 } // namespace content 121 } // namespace content
122 122
123 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_ 123 #endif // CONTENT_RENDERER_MEDIA_ANDROID_MEDIA_INFO_LOADER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/active_loader.cc ('k') | content/renderer/media/android/media_info_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698