Remove pointer from PermissionPromptAndroid to InfoBar

chrome/browser/permissions/permission_prompt_android.cc

 // Copyright 2016 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/permissions/permission_prompt_android.h"
 
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/infobars/infobar_service.h"

[dominickn, 2017/03/17 01:45:25]

This is now unused.

[Timothy Loh, 2017/03/17 02:34:21]

This is used in Show(). Removed the other unused ones.

 #include "chrome/browser/media/webrtc/media_stream_devices_controller.h"

[dominickn, 2017/03/17 01:45:26]

I don't think this header is used?

 #include "chrome/browser/permissions/grouped_permission_infobar_delegate_android.h"
 #include "chrome/browser/permissions/permission_request.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "components/infobars/core/infobar.h"

[dominickn, 2017/03/17 01:45:26]

Not used?

 #include "content/public/browser/web_contents.h"

[dominickn, 2017/03/17 01:45:25]

We don't actually call any methods on WebContents now so the forward declaration
in the header file is fine. Remove this.

 
 PermissionPromptAndroid::PermissionPromptAndroid(
     content::WebContents* web_contents)
-    : web_contents_(web_contents), delegate_(nullptr), infobar_(nullptr) {
+    : web_contents_(web_contents), delegate_(nullptr) {
   DCHECK(web_contents);
 }
 
-PermissionPromptAndroid::~PermissionPromptAndroid() {
-  if (infobar_) {
-    GroupedPermissionInfoBarDelegate* infobar_delegate =
-        static_cast<GroupedPermissionInfoBarDelegate*>(infobar_->delegate());
-    infobar_delegate->PermissionPromptDestroyed();
-  }
-}
+PermissionPromptAndroid::~PermissionPromptAndroid() {}
 
 void PermissionPromptAndroid::SetDelegate(Delegate* delegate) {
   delegate_ = delegate;
 }
 
 void PermissionPromptAndroid::Show(
     const std::vector<PermissionRequest*>& requests,
     const std::vector<bool>& values) {
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents_);
   if (!infobar_service)
     return;
 
   requests_ = requests;
-  infobar_ = GroupedPermissionInfoBarDelegate::Create(this, infobar_service,
-                                                      requests[0]->GetOrigin());
+  GroupedPermissionInfoBarDelegate::Create(this, infobar_service,
+                                           requests[0]->GetOrigin());
 }
 
 bool PermissionPromptAndroid::CanAcceptRequestUpdate() {
   return false;
 }
 
 void PermissionPromptAndroid::Hide() {
-  InfoBarService* infobar_service =
-      InfoBarService::FromWebContents(web_contents_);
-  if (infobar_ && infobar_service) {
-    infobar_service->RemoveInfoBar(infobar_);
-  }
-  infobar_ = nullptr;
+  // No-op. Hide() is called in three cases:
+  // - After the user resolves a prompt. The infobar manager will hide the
+  // prompt for us.
+  // - DidFinishNavigation, etc. The infobar manager handles this.
+  // - PermissionManager::CancelRequest(). As CanAcceptRequestUpdate() returns
+  // false, it doesn't call into here and instead dummies out the callbacks.
 }
 
 bool PermissionPromptAndroid::IsVisible() {
-  return infobar_ != nullptr;
+  return !requests_.empty();
 }
 
 void PermissionPromptAndroid::UpdateAnchorPosition() {
   NOTREACHED() << "UpdateAnchorPosition is not implemented";
 }
 
 gfx::NativeWindow PermissionPromptAndroid::GetNativeWindow() {
   NOTREACHED() << "GetNativeWindow is not implemented";
   return nullptr;
 }
@@ skipping 36 matching lines @@
     size_t position) const {
   DCHECK_LT(position, requests_.size());
   return requests_[position]->GetMessageTextFragment();
 }
 
 // static
 std::unique_ptr<PermissionPrompt> PermissionPrompt::Create(
     content::WebContents* web_contents) {
   return base::MakeUnique<PermissionPromptAndroid>(web_contents);
 }