OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/android/logo_bridge.h" | 5 #include "chrome/browser/android/logo_bridge.h" |
6 | 6 |
7 #include <jni.h> | 7 #include <jni.h> |
8 | 8 |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 private: | 72 private: |
73 // The associated LogoBridge. We won't call back to Java if the LogoBridge has | 73 // The associated LogoBridge. We won't call back to Java if the LogoBridge has |
74 // been destroyed. | 74 // been destroyed. |
75 base::WeakPtr<LogoBridge> logo_bridge_; | 75 base::WeakPtr<LogoBridge> logo_bridge_; |
76 | 76 |
77 base::android::ScopedJavaGlobalRef<jobject> j_logo_observer_; | 77 base::android::ScopedJavaGlobalRef<jobject> j_logo_observer_; |
78 }; | 78 }; |
79 | 79 |
80 } // namespace | 80 } // namespace |
81 | 81 |
82 static jlong Init(JNIEnv* env, jobject obj, jobject j_profile) { | 82 static jlong Init(JNIEnv* env, |
| 83 const JavaParamRef<jobject>& obj, |
| 84 const JavaParamRef<jobject>& j_profile) { |
83 LogoBridge* logo_bridge = new LogoBridge(j_profile); | 85 LogoBridge* logo_bridge = new LogoBridge(j_profile); |
84 return reinterpret_cast<intptr_t>(logo_bridge); | 86 return reinterpret_cast<intptr_t>(logo_bridge); |
85 } | 87 } |
86 | 88 |
87 LogoBridge::LogoBridge(jobject j_profile) : weak_ptr_factory_(this) { | 89 LogoBridge::LogoBridge(jobject j_profile) : weak_ptr_factory_(this) { |
88 Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile); | 90 Profile* profile = ProfileAndroid::FromProfileAndroid(j_profile); |
89 if (profile) | 91 if (profile) |
90 logo_service_ = LogoServiceFactory::GetForProfile(profile); | 92 logo_service_ = LogoServiceFactory::GetForProfile(profile); |
91 } | 93 } |
92 | 94 |
(...skipping 12 matching lines...) Expand all Loading... |
105 // |observer| is deleted in LogoObserverAndroid::OnObserverRemoved(). | 107 // |observer| is deleted in LogoObserverAndroid::OnObserverRemoved(). |
106 LogoObserverAndroid* observer = new LogoObserverAndroid( | 108 LogoObserverAndroid* observer = new LogoObserverAndroid( |
107 weak_ptr_factory_.GetWeakPtr(), env, j_logo_observer); | 109 weak_ptr_factory_.GetWeakPtr(), env, j_logo_observer); |
108 logo_service_->GetLogo(observer); | 110 logo_service_->GetLogo(observer); |
109 } | 111 } |
110 | 112 |
111 // static | 113 // static |
112 bool RegisterLogoBridge(JNIEnv* env) { | 114 bool RegisterLogoBridge(JNIEnv* env) { |
113 return RegisterNativesImpl(env); | 115 return RegisterNativesImpl(env); |
114 } | 116 } |
OLD | NEW |