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

Unified Diff: ui/gfx/android/window_android.cc

Issue 14169011: [Android] Rename NativeWindow to WindowAndroid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Return Activity context for now Created 7 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/gfx/android/window_android.h ('k') | ui/shell_dialogs/select_file_dialog_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/android/window_android.cc
diff --git a/ui/gfx/android/window_android.cc b/ui/gfx/android/window_android.cc
deleted file mode 100644
index 9ade2bb02465237589f31fde8110d2552b2b9e37..0000000000000000000000000000000000000000
--- a/ui/gfx/android/window_android.cc
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "window_android.h"
-
-#include "base/android/jni_android.h"
-#include "base/android/jni_helper.h"
-#include "base/android/scoped_java_ref.h"
-#include "jni/NativeWindow_jni.h"
-
-namespace ui {
-
-using base::android::AttachCurrentThread;
-using base::android::ScopedJavaLocalRef;
-
-WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj)
- : weak_java_window_(env, obj) {
-}
-
-void WindowAndroid::Destroy(JNIEnv* env, jobject obj) {
- delete this;
-}
-
-ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() {
- JNIEnv* env = AttachCurrentThread();
- return weak_java_window_.get(env);
-}
-
-bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) {
- return RegisterNativesImpl(env);
-}
-
-WindowAndroid::~WindowAndroid() {
-}
-
-// ----------------------------------------------------------------------------
-// Native JNI methods
-// ----------------------------------------------------------------------------
-
-jint Init(JNIEnv* env, jobject obj) {
- WindowAndroid* window = new WindowAndroid(env, obj);
- return reinterpret_cast<jint>(window);
-}
-
-} // namespace ui
« no previous file with comments | « ui/gfx/android/window_android.h ('k') | ui/shell_dialogs/select_file_dialog_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698