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

Side by Side Diff: ui/base/android/view_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/view_android.h ('k') | ui/base/android/window_android.h » ('j') | 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/view_android.h" 5 #include "ui/base/android/view_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_helper.h" 8 #include "base/android/jni_weak_ref.h"
9 #include "base/android/scoped_java_ref.h" 9 #include "base/android/scoped_java_ref.h"
10 #include "jni/ViewAndroid_jni.h" 10 #include "jni/ViewAndroid_jni.h"
11 #include "ui/base/android/window_android.h" 11 #include "ui/base/android/window_android.h"
12 12
13 namespace ui { 13 namespace ui {
14 14
15 using base::android::AttachCurrentThread; 15 using base::android::AttachCurrentThread;
16 using base::android::ScopedJavaLocalRef; 16 using base::android::ScopedJavaLocalRef;
17 17
18 ViewAndroid::ViewAndroid(JNIEnv* env, jobject obj, WindowAndroid* window) 18 ViewAndroid::ViewAndroid(JNIEnv* env, jobject obj, WindowAndroid* window)
(...skipping 23 matching lines...) Expand all
42 ViewAndroid::~ViewAndroid() { 42 ViewAndroid::~ViewAndroid() {
43 } 43 }
44 44
45 jlong Init(JNIEnv* env, jobject obj, jlong window) { 45 jlong Init(JNIEnv* env, jobject obj, jlong window) {
46 ViewAndroid* view = new ViewAndroid( 46 ViewAndroid* view = new ViewAndroid(
47 env, obj, reinterpret_cast<ui::WindowAndroid*>(window)); 47 env, obj, reinterpret_cast<ui::WindowAndroid*>(window));
48 return reinterpret_cast<intptr_t>(view); 48 return reinterpret_cast<intptr_t>(view);
49 } 49 }
50 50
51 } // namespace ui 51 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/android/view_android.h ('k') | ui/base/android/window_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698