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

Unified Diff: services/native_viewport/platform_viewport_android.h

Issue 1081443005: Make the C++ PlatformViewportAndroid's dtor call the Java PVA's destroy() method. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: use a weak ref instead 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
Index: services/native_viewport/platform_viewport_android.h
diff --git a/services/native_viewport/platform_viewport_android.h b/services/native_viewport/platform_viewport_android.h
index 75ed03829a295d2c7664e822fa45205a3662ed88..65929034c709bf9a7f21a13255afc117d535d616 100644
--- a/services/native_viewport/platform_viewport_android.h
+++ b/services/native_viewport/platform_viewport_android.h
@@ -6,7 +6,6 @@
#define SERVICES_NATIVE_VIEWPORT_PLATFORM_VIEWPORT_ANDROID_H_
#include "base/android/jni_weak_ref.h"
-#include "base/android/scoped_java_ref.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "services/native_viewport/platform_viewport.h"
@@ -68,7 +67,8 @@ class PlatformViewportAndroid : public PlatformViewport {
void ReleaseWindow();
- Delegate* delegate_;
+ Delegate* const delegate_;
+ JavaObjectWeakGlobalRef java_platform_viewport_android_;
ANativeWindow* window_;
mojo::ViewportMetricsPtr metrics_;
ui::SequentialIDGenerator id_generator_;

Powered by Google App Engine
This is Rietveld 408576698