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

Unified Diff: content/renderer/media/stream_texture_factory_impl_android.h

Issue 17502007: Move webkit/renderer/media/android/ to content/renderer/media/android/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix shared lib Created 7 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/stream_texture_factory_impl_android.h
diff --git a/content/renderer/media/stream_texture_factory_impl_android.h b/content/renderer/media/stream_texture_factory_impl_android.h
deleted file mode 100644
index 4c020725d457b83968a950174e748a3e22d95277..0000000000000000000000000000000000000000
--- a/content/renderer/media/stream_texture_factory_impl_android.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_RENDERER_MEDIA_STREAM_TEXTURE_IMPL_ANDROID_H_
-#define CONTENT_RENDERER_MEDIA_STREAM_TEXTURE_IMPL_ANDROID_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "content/renderer/gpu/stream_texture_host_android.h"
-#include "webkit/renderer/media/android/stream_texture_factory_android.h"
-
-namespace WebKit {
-class WebGraphicsContext3D;
-}
-
-namespace content {
-class GpuChannelHost;
-
-// The acutal implementation of StreamTextureFactory class.
-class StreamTextureFactoryImpl
- : public webkit_media::StreamTextureFactory {
- public:
- StreamTextureFactoryImpl(WebKit::WebGraphicsContext3D* context,
- GpuChannelHost* channel,
- int view_id);
- virtual ~StreamTextureFactoryImpl();
-
- // webkit_media::StreamTextureFactory implementation:
- virtual webkit_media::StreamTextureProxy* CreateProxy() OVERRIDE;
-
- virtual void EstablishPeer(int stream_id, int player_id) OVERRIDE;
-
- virtual unsigned CreateStreamTexture(unsigned* texture_id) OVERRIDE;
- virtual void DestroyStreamTexture(unsigned texture_id) OVERRIDE;
-
- private:
- WebKit::WebGraphicsContext3D* context_;
- scoped_refptr<GpuChannelHost> channel_;
- int view_id_;
- DISALLOW_COPY_AND_ASSIGN(StreamTextureFactoryImpl);
-};
-
-} // namespace content
-
-#endif // CONTENT_RENDERER_MEDIA_STREAM_TEXTURE_IMPL_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698