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

Unified Diff: ui/ozone/platform/cast/surface_factory_cast.h

Issue 1059073002: Loads CastEglPlatform implementation from shared library. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add myself to OWNERS for cast ozone platform. Created 5 years, 8 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
« no previous file with comments | « ui/ozone/platform/cast/platform_window_cast.cc ('k') | ui/ozone/platform/cast/surface_factory_cast.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/cast/surface_factory_cast.h
diff --git a/chromecast/ozone/surface_factory_cast.h b/ui/ozone/platform/cast/surface_factory_cast.h
similarity index 78%
rename from chromecast/ozone/surface_factory_cast.h
rename to ui/ozone/platform/cast/surface_factory_cast.h
index cd39b5561776c2ccbd3a07636c66f1f8e1713613..aaa8d2a52a49182a6e75bf9d3d4e621c44c30296 100644
--- a/chromecast/ozone/surface_factory_cast.h
+++ b/ui/ozone/platform/cast/surface_factory_cast.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROMECAST_OZONE_SURFACE_FACTORY_CAST_H_
-#define CHROMECAST_OZONE_SURFACE_FACTORY_CAST_H_
+#ifndef UI_OZONE_PLATFORM_CAST_SURFACE_FACTORY_CAST_H_
+#define UI_OZONE_PLATFORM_CAST_SURFACE_FACTORY_CAST_H_
#include "base/callback.h"
#include "base/memory/scoped_ptr.h"
@@ -11,19 +11,21 @@
#include "ui/ozone/public/surface_factory_ozone.h"
namespace chromecast {
-namespace ozone {
-
class CastEglPlatform;
+}
+
+namespace ui {
// SurfaceFactoryOzone implementation for OzonePlatformCast.
-class SurfaceFactoryCast : public ui::SurfaceFactoryOzone {
+class SurfaceFactoryCast : public SurfaceFactoryOzone {
public:
- explicit SurfaceFactoryCast(scoped_ptr<CastEglPlatform> egl_platform);
+ explicit SurfaceFactoryCast(
+ scoped_ptr<chromecast::CastEglPlatform> egl_platform);
~SurfaceFactoryCast() override;
- // ui::SurfaceFactoryOzone implementation:
+ // SurfaceFactoryOzone implementation:
intptr_t GetNativeDisplay() override;
- scoped_ptr<ui::SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
+ scoped_ptr<SurfaceOzoneEGL> CreateEGLSurfaceForWidget(
gfx::AcceleratedWidget widget) override;
const int32* GetEGLSurfaceProperties(const int32* desired_list) override;
bool LoadEGLGLES2Bindings(
@@ -58,17 +60,16 @@ class SurfaceFactoryCast : public ui::SurfaceFactoryOzone {
HardwareState state_;
DestroyWindowPendingState destroy_window_pending_state_;
base::Closure relinquish_display_callback_;
- intptr_t display_type_;
- intptr_t window_;
+ void* display_type_;
+ void* window_;
const gfx::Size default_display_size_;
gfx::Size display_size_;
gfx::Size new_display_size_;
- scoped_ptr<CastEglPlatform> egl_platform_;
+ scoped_ptr<chromecast::CastEglPlatform> egl_platform_;
DISALLOW_COPY_AND_ASSIGN(SurfaceFactoryCast);
};
-} // namespace ozone
-} // namespace chromecast
+} // namespace ui
-#endif // CHROMECAST_OZONE_SURFACE_FACTORY_CAST_H_
+#endif // UI_OZONE_PLATFORM_CAST_SURFACE_FACTORY_CAST_H_
« no previous file with comments | « ui/ozone/platform/cast/platform_window_cast.cc ('k') | ui/ozone/platform/cast/surface_factory_cast.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698