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

Side by Side Diff: ui/base/android/window_android.cc

Issue 247263009: Rename jni_helper.h to jni_weak_ref.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/base/android/window_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/base/android/window_android.h" 5 #include "ui/base/android/window_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_helper.h" 9 #include "base/android/jni_weak_ref.h"
10 #include "base/android/scoped_java_ref.h" 10 #include "base/android/scoped_java_ref.h"
11 #include "jni/WindowAndroid_jni.h" 11 #include "jni/WindowAndroid_jni.h"
12 #include "ui/base/android/window_android_compositor.h" 12 #include "ui/base/android/window_android_compositor.h"
13 #include "ui/base/android/window_android_observer.h" 13 #include "ui/base/android/window_android_observer.h"
14 14
15 namespace ui { 15 namespace ui {
16 16
17 using base::android::AttachCurrentThread; 17 using base::android::AttachCurrentThread;
18 using base::android::ScopedJavaLocalRef; 18 using base::android::ScopedJavaLocalRef;
19 19
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // ---------------------------------------------------------------------------- 92 // ----------------------------------------------------------------------------
93 // Native JNI methods 93 // Native JNI methods
94 // ---------------------------------------------------------------------------- 94 // ----------------------------------------------------------------------------
95 95
96 jlong Init(JNIEnv* env, jobject obj) { 96 jlong Init(JNIEnv* env, jobject obj) {
97 WindowAndroid* window = new WindowAndroid(env, obj); 97 WindowAndroid* window = new WindowAndroid(env, obj);
98 return reinterpret_cast<intptr_t>(window); 98 return reinterpret_cast<intptr_t>(window);
99 } 99 }
100 100
101 } // namespace ui 101 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/android/window_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698