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

Unified Diff: ui/android/window_android.cc

Issue 2595263002: Introduce ViewRoot forwarding input/view events to native (Closed)
Patch Set: updateViewRoot, ... Created 3 years, 11 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: ui/android/window_android.cc
diff --git a/ui/android/window_android.cc b/ui/android/window_android.cc
index 770fda4bde502d16a39f5dd0a5660e5fbdac6a32..b528b050bf643c4c4c05a1d9fe9ff3a3730ce188 100644
--- a/ui/android/window_android.cc
+++ b/ui/android/window_android.cc
@@ -150,7 +150,6 @@ bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
}
WindowAndroid::~WindowAndroid() {
- DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view.";
DCHECK(!compositor_);
Java_WindowAndroid_clearNativePointer(AttachCurrentThread(), GetJavaObject());
}
@@ -255,12 +254,6 @@ void WindowAndroid::OnActivityStarted(JNIEnv* env,
observer.OnActivityStarted();
}
-ScopedJavaLocalRef<jobject> WindowAndroid::GetViewRootForJava(
- JNIEnv* env,
- const base::android::JavaParamRef<jobject>& obj) {
- return GetViewRoot();
-}
-
bool WindowAndroid::HasPermission(const std::string& permission) {
JNIEnv* env = AttachCurrentThread();
return Java_WindowAndroid_hasPermission(
@@ -275,11 +268,6 @@ bool WindowAndroid::CanRequestPermission(const std::string& permission) {
base::android::ConvertUTF8ToJavaString(env, permission));
}
-WindowAndroid* WindowAndroid::GetWindowAndroid() const {
- DCHECK(parent_ == nullptr);
- return const_cast<WindowAndroid*>(this);
-}
-
// ----------------------------------------------------------------------------
// Native JNI methods
// ----------------------------------------------------------------------------
« ui/android/view_root.cc ('K') | « ui/android/window_android.h ('k') | ui/snapshot/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698