| OLD | NEW |
| 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 "chrome/browser/profiles/profile_android.h" | 5 #include "chrome/browser/profiles/profile_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/profiles/profile_destroyer.h" | 9 #include "chrome/browser/profiles/profile_destroyer.h" |
| 10 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
| 11 #include "jni/Profile_jni.h" | 11 #include "jni/Profile_jni.h" |
| 12 | 12 |
| 13 using base::android::AttachCurrentThread; | 13 using base::android::AttachCurrentThread; |
| 14 using base::android::JavaParamRef; |
| 15 using base::android::ScopedJavaLocalRef; |
| 14 | 16 |
| 15 namespace { | 17 namespace { |
| 16 const char kProfileAndroidKey[] = "profile_android"; | 18 const char kProfileAndroidKey[] = "profile_android"; |
| 17 } // namespace | 19 } // namespace |
| 18 | 20 |
| 19 // static | 21 // static |
| 20 ProfileAndroid* ProfileAndroid::FromProfile(Profile* profile) { | 22 ProfileAndroid* ProfileAndroid::FromProfile(Profile* profile) { |
| 21 if (!profile) | 23 if (!profile) |
| 22 return NULL; | 24 return NULL; |
| 23 | 25 |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 obj_.Reset(env, jprofile.obj()); | 118 obj_.Reset(env, jprofile.obj()); |
| 117 } | 119 } |
| 118 | 120 |
| 119 ProfileAndroid::~ProfileAndroid() { | 121 ProfileAndroid::~ProfileAndroid() { |
| 120 Java_Profile_onNativeDestroyed(AttachCurrentThread(), obj_.obj()); | 122 Java_Profile_onNativeDestroyed(AttachCurrentThread(), obj_.obj()); |
| 121 } | 123 } |
| 122 | 124 |
| 123 base::android::ScopedJavaLocalRef<jobject> ProfileAndroid::GetJavaObject() { | 125 base::android::ScopedJavaLocalRef<jobject> ProfileAndroid::GetJavaObject() { |
| 124 return base::android::ScopedJavaLocalRef<jobject>(obj_); | 126 return base::android::ScopedJavaLocalRef<jobject>(obj_); |
| 125 } | 127 } |
| OLD | NEW |