| Index: chrome/browser/ui/android/infobars/translate_infobar.h
|
| ===================================================================
|
| --- chrome/browser/ui/android/infobars/translate_infobar.h (revision 226624)
|
| +++ chrome/browser/ui/android/infobars/translate_infobar.h (working copy)
|
| @@ -10,14 +10,9 @@
|
| #include "chrome/browser/translate/translate_infobar_delegate.h"
|
| #include "chrome/browser/ui/android/infobars/infobar_android.h"
|
|
|
| -namespace gfx {
|
| -class Image;
|
| -}
|
| -
|
| -// Implementation of InfoBar for translate.
|
| class TranslateInfoBar : public InfoBarAndroid {
|
| public:
|
| - TranslateInfoBar(InfoBarService* owner, TranslateInfoBarDelegate* delegate);
|
| + explicit TranslateInfoBar(scoped_ptr<TranslateInfoBarDelegate> delegate);
|
| virtual ~TranslateInfoBar();
|
|
|
| // JNI methods specific to translate
|
| @@ -30,7 +25,7 @@
|
| bool never_translate_site);
|
|
|
| private:
|
| - // InfoBar overrides.
|
| + // InfoBarAndroid:
|
| virtual base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
|
| JNIEnv* env) OVERRIDE;
|
| virtual void ProcessButton(int action,
|
| @@ -42,13 +37,14 @@
|
| void TransferOwnership(TranslateInfoBar* destination,
|
| TranslateInfoBarDelegate::Type new_type);
|
|
|
| - TranslateInfoBarDelegate* delegate_;
|
| + TranslateInfoBarDelegate* GetDelegate();
|
| +
|
| base::android::ScopedJavaGlobalRef<jobject> java_translate_delegate_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TranslateInfoBar);
|
| };
|
|
|
| -// Registers native methods
|
| +// Registers native methods.
|
| bool RegisterTranslateInfoBarDelegate(JNIEnv* env);
|
|
|
| #endif // CHROME_BROWSER_UI_ANDROID_INFOBARS_TRANSLATE_INFOBAR_H_
|
|
|