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

Unified Diff: services/native_viewport/native_viewport_impl.cc

Issue 2011053003: Make PlatformViewport and NativeViewportImpl use Shell* instead of ApplicationImpl*. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fix android Created 4 years, 7 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: services/native_viewport/native_viewport_impl.cc
diff --git a/services/native_viewport/native_viewport_impl.cc b/services/native_viewport/native_viewport_impl.cc
index 46961ba9cb5aeee9ea0be0da0b9342b61f75a8bf..9349647a9656640c7be47e46f3465d47d3c3c75d 100644
--- a/services/native_viewport/native_viewport_impl.cc
+++ b/services/native_viewport/native_viewport_impl.cc
@@ -11,7 +11,6 @@
#include "base/time/time.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/converters/native_viewport/surface_configuration_type_converters.h"
-#include "mojo/public/cpp/application/application_impl.h"
#include "services/gles2/gpu_state.h"
#include "services/native_viewport/platform_viewport_headless.h"
#include "ui/events/event.h"
@@ -20,11 +19,11 @@
namespace native_viewport {
NativeViewportImpl::NativeViewportImpl(
- mojo::ApplicationImpl* application,
+ mojo::Shell* shell,
bool is_headless,
const scoped_refptr<gles2::GpuState>& gpu_state,
mojo::InterfaceRequest<mojo::NativeViewport> request)
- : application_(application),
+ : shell_(shell),
is_headless_(is_headless),
context_provider_(gpu_state),
sent_metrics_(false),
@@ -52,7 +51,7 @@ void NativeViewportImpl::Create(
if (is_headless_)
platform_viewport_ = PlatformViewportHeadless::Create(this);
else
- platform_viewport_ = PlatformViewport::Create(application_, this);
+ platform_viewport_ = PlatformViewport::Create(shell_, this);
platform_viewport_->Init(gfx::Rect(size.To<gfx::Size>()));
}
« no previous file with comments | « services/native_viewport/native_viewport_impl.h ('k') | services/native_viewport/ozone/platform_viewport_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698