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

Unified Diff: components/native_viewport/native_viewport_impl.h

Issue 1139673003: Make Mandoline shut down cleanly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix X errors on Linux Created 5 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: components/native_viewport/native_viewport_impl.h
diff --git a/components/native_viewport/native_viewport_impl.h b/components/native_viewport/native_viewport_impl.h
index 503509df9f10992ab62f991e05e96b92624b3114..3e72185ee9a799d749e001c37f32bc902f3a3a6c 100644
--- a/components/native_viewport/native_viewport_impl.h
+++ b/components/native_viewport/native_viewport_impl.h
@@ -13,6 +13,7 @@
#include "components/native_viewport/onscreen_context_provider.h"
#include "components/native_viewport/platform_viewport.h"
#include "components/native_viewport/public/interfaces/native_viewport.mojom.h"
+#include "mojo/application/app_lifetime_helper.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h"
#include "ui/gfx/geometry/rect.h"
@@ -36,7 +37,8 @@ class NativeViewportImpl : public mojo::NativeViewport,
public:
NativeViewportImpl(bool is_headless,
const scoped_refptr<gles2::GpuState>& gpu_state,
- mojo::InterfaceRequest<mojo::NativeViewport> request);
+ mojo::InterfaceRequest<mojo::NativeViewport> request,
+ scoped_ptr<mojo::AppRefCount> app_refcount);
~NativeViewportImpl() override;
// NativeViewport implementation.
@@ -69,8 +71,9 @@ class NativeViewportImpl : public mojo::NativeViewport,
void AckEvent(int32 pointer_id);
bool is_headless_;
+ scoped_ptr<mojo::AppRefCount> app_refcount_;
scoped_ptr<PlatformViewport> platform_viewport_;
- OnscreenContextProvider context_provider_;
+ scoped_ptr<OnscreenContextProvider> context_provider_;
bool sent_metrics_;
mojo::ViewportMetricsPtr metrics_;
CreateCallback create_callback_;

Powered by Google App Engine
This is Rietveld 408576698