| Index: chrome/browser/android/logo_bridge.h
|
| diff --git a/chrome/browser/android/logo_bridge.h b/chrome/browser/android/logo_bridge.h
|
| index 37d30ee225ca32e80a6ba8b8781500bd41644879..cfcd6d4333f2ba1aafa6bc3238341eafaafb0e0a 100644
|
| --- a/chrome/browser/android/logo_bridge.h
|
| +++ b/chrome/browser/android/logo_bridge.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <jni.h>
|
|
|
| +#include "base/android/jni_weak_ref.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
|
|
| @@ -20,10 +21,20 @@ class LogoBridge {
|
| void Destroy(JNIEnv* env, jobject obj);
|
| void GetCurrentLogo(JNIEnv* env, jobject obj, jobject j_logo_observer);
|
|
|
| + void GetAnimatedLogo(JNIEnv* env,
|
| + jobject obj,
|
| + jobject j_listener,
|
| + jstring j_url);
|
| +
|
| + void OnAnimatedLogoReady(const std::string& raw_string);
|
| +
|
| + LogoService* logo_service_;
|
| +
|
| private:
|
| ~LogoBridge();
|
|
|
| - LogoService* logo_service_;
|
| + JavaObjectWeakGlobalRef j_listener_weak_ref;
|
| +
|
| base::WeakPtrFactory<LogoBridge> weak_ptr_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(LogoBridge);
|
|
|