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/ui/android/infobars/infobar_container_android.h" | 5 #include "chrome/browser/ui/android/infobars/infobar_container_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "chrome/browser/infobars/infobar_service.h" | 10 #include "chrome/browser/infobars/infobar_service.h" |
11 #include "chrome/browser/ui/android/infobars/infobar_android.h" | 11 #include "chrome/browser/ui/android/infobars/infobar_android.h" |
12 #include "components/infobars/core/infobar.h" | 12 #include "components/infobars/core/infobar.h" |
13 #include "components/infobars/core/infobar_delegate.h" | 13 #include "components/infobars/core/infobar_delegate.h" |
14 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
15 #include "jni/InfoBarContainer_jni.h" | 15 #include "jni/InfoBarContainer_jni.h" |
16 | 16 |
| 17 using base::android::JavaParamRef; |
17 | 18 |
18 // InfoBarContainerAndroid ---------------------------------------------------- | 19 // InfoBarContainerAndroid ---------------------------------------------------- |
19 | 20 |
20 InfoBarContainerAndroid::InfoBarContainerAndroid(JNIEnv* env, | 21 InfoBarContainerAndroid::InfoBarContainerAndroid(JNIEnv* env, |
21 jobject obj) | 22 jobject obj) |
22 : infobars::InfoBarContainer(NULL), | 23 : infobars::InfoBarContainer(NULL), |
23 weak_java_infobar_container_(env, obj) {} | 24 weak_java_infobar_container_(env, obj) {} |
24 | 25 |
25 InfoBarContainerAndroid::~InfoBarContainerAndroid() { | 26 InfoBarContainerAndroid::~InfoBarContainerAndroid() { |
26 RemoveAllInfoBarsForDestruction(); | 27 RemoveAllInfoBarsForDestruction(); |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
86 | 87 |
87 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 88 static jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
88 InfoBarContainerAndroid* infobar_container = | 89 InfoBarContainerAndroid* infobar_container = |
89 new InfoBarContainerAndroid(env, obj); | 90 new InfoBarContainerAndroid(env, obj); |
90 return reinterpret_cast<intptr_t>(infobar_container); | 91 return reinterpret_cast<intptr_t>(infobar_container); |
91 } | 92 } |
92 | 93 |
93 bool RegisterInfoBarContainer(JNIEnv* env) { | 94 bool RegisterInfoBarContainer(JNIEnv* env) { |
94 return RegisterNativesImpl(env); | 95 return RegisterNativesImpl(env); |
95 } | 96 } |
OLD | NEW |