Infobar system refactor.

chrome/browser/ui/android/infobars/infobar_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/infobars/infobar_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/android/resource_mapper.h"
@@ skipping 10 matching lines @@
 const int InfoBar::kSeparatorLineHeight = 1;
 const int InfoBar::kDefaultArrowTargetHeight = 9;
 const int InfoBar::kMaximumArrowTargetHeight = 24;
 const int InfoBar::kDefaultArrowTargetHalfWidth = kDefaultArrowTargetHeight;
 const int InfoBar::kMaximumArrowTargetHalfWidth = 14;
 const int InfoBar::kDefaultBarTargetHeight = 36;
 
 
 // InfoBarAndroid -------------------------------------------------------------
 
-InfoBarAndroid::InfoBarAndroid(InfoBarService* owner, InfoBarDelegate* delegate)
-    : InfoBar(owner, delegate),
-      delegate_(delegate) {
-  DCHECK(delegate_);
-  DCHECK(delegate_->owner());
+InfoBarAndroid::InfoBarAndroid(scoped_ptr<InfoBarDelegate> delegate)
+    : InfoBar(delegate.Pass()) {
 }
 
 InfoBarAndroid::~InfoBarAndroid() {
 }
 
 void InfoBarAndroid::ReassignJavaInfoBar(InfoBarAndroid* replacement) {
   DCHECK(replacement);
   if (!java_info_bar_.is_null()) {
     replacement->set_java_infobar(java_info_bar_);
     java_info_bar_.Reset();
   }
 }
 
 void InfoBarAndroid::set_java_infobar(
     const base::android::JavaRef<jobject>& java_info_bar) {
   DCHECK(java_info_bar_.is_null());
   java_info_bar_.Reset(java_info_bar);
 }
 
 bool InfoBarAndroid::HasSetJavaInfoBar() const {
   return !java_info_bar_.is_null();
 }
 
 void InfoBarAndroid::OnButtonClicked(JNIEnv* env,
                                      jobject obj,
                                      jint action,
                                      jstring action_value) {
-  DCHECK(delegate_);
   std::string value = base::android::ConvertJavaStringToUTF8(env, action_value);
   ProcessButton(action, value);
 }
 
 void InfoBarAndroid::OnCloseButtonClicked(JNIEnv* env, jobject obj) {
-  delegate_->InfoBarDismissed();
+  delegate()->InfoBarDismissed();
+  CloseInfoBar();  // TODO(pkasting): Is this correct?

[Miguel Garcia, 2013/10/07 15:19:00]

This method is being removed in https://codereview.chromium.org/26176007/

Right now, closing the java infobar here is not needed. When the user clicks the
X button in java we first close the java bar, then notify C++ via this method.
This was a mistake really and but it was done like that in an attempt to share
the java implementation by java only infobars and C++ infobars. We are trying to
get rid of the former and have all infobars have a C++ equivalent.

As part of the cleanup we are making it very explicit what is the logic for java
only infobars and C++ infobars (so we can transition the former in a second
step)  https://codereview.chromium.org/26263002/ is another step in that
direction. There I add a RemoveSelf after this so the infobar can be dismissed
properly. 

[Peter Kasting, 2013/10/07 20:19:24]

Sounds like I should just wait for that to go in and then take another look
here.

 }
 
 void InfoBarAndroid::OnInfoBarClosed(JNIEnv* env, jobject obj) {
   java_info_bar_.Reset();  // So we don't notify Java.
-  if (owner())
-    RemoveSelf();
+  RemoveSelf();
 }
 
 void InfoBarAndroid::CloseJavaInfoBar() {
   if (!java_info_bar_.is_null()) {
     JNIEnv* env = base::android::AttachCurrentThread();
     Java_InfoBar_closeInfoBar(env, java_info_bar_.obj());
   }
 }
 
 int InfoBarAndroid::GetEnumeratedIconId() {
-  DCHECK(delegate_);
-  return ResourceMapper::MapFromChromiumId(delegate_->GetIconID());
+  return ResourceMapper::MapFromChromiumId(delegate()->GetIconID());
 }
 
 void InfoBarAndroid::CloseInfoBar() {
   CloseJavaInfoBar();
-  if (owner())
-    RemoveSelf();
+  RemoveSelf();
 }
 
 
 // Native JNI methods ---------------------------------------------------------
 
 bool RegisterNativeInfoBar(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }