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

Side by Side Diff: ui/android/view_android.cc

Issue 1041823004: Remove java ViewAndroid class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: java PowerSaveBlocker 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 unified diff | Download patch
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/android/view_android.h" 5 #include "ui/android/view_android.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/logging.h"
8 9
9 namespace ui { 10 namespace ui {
10 11
11 using base::android::AttachCurrentThread; 12 using base::android::AttachCurrentThread;
12 using base::android::ScopedJavaLocalRef; 13 using base::android::ScopedJavaLocalRef;
13 14
14 ViewAndroid::ViewAndroid(jobject obj, WindowAndroid* window) 15 ViewAndroid::ViewAndroid(jobject view_android_delegate, WindowAndroid* window)
15 : window_android_(window) { 16 : window_android_(window) {
16 java_view_.Reset(AttachCurrentThread(), obj); 17 DCHECK(view_android_delegate);
18 view_android_delegate_.Reset(AttachCurrentThread(), view_android_delegate);
17 } 19 }
18 20
19 ViewAndroid::~ViewAndroid() { 21 ViewAndroid::~ViewAndroid() {
20 } 22 }
21 23
22 ScopedJavaLocalRef<jobject> ViewAndroid::GetJavaObject() { 24 ScopedJavaLocalRef<jobject> ViewAndroid::GetViewAndroidDelegate() {
23 return base::android::ScopedJavaLocalRef<jobject>(java_view_); 25 return base::android::ScopedJavaLocalRef<jobject>(view_android_delegate_);
24 } 26 }
25 27
26 WindowAndroid* ViewAndroid::GetWindowAndroid() { 28 WindowAndroid* ViewAndroid::GetWindowAndroid() {
27 return window_android_; 29 return window_android_;
28 } 30 }
29 31
30 } // namespace ui 32 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698