Add method for identifying different InfoBars

chrome/browser/devtools/global_confirm_info_bar.cc

 // Copyright 2015 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/devtools/global_confirm_info_bar.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "components/infobars/core/infobar.h"
 #include "ui/gfx/image/image.h"
 
 // InfoBarDelegateProxy -------------------------------------------------------
 
 class GlobalConfirmInfoBar::DelegateProxy : public ConfirmInfoBarDelegate {
  public:
   explicit DelegateProxy(base::WeakPtr<GlobalConfirmInfoBar> global_info_bar);
   ~DelegateProxy() override;
   void Detach();
 
  private:
   friend class GlobalConfirmInfoBar;
 
   // ConfirmInfoBarDelegate overrides
+  infobars::InfoBarDelegate::InfoBarIdentifier GetIdentifier() const override;
   base::string16 GetMessageText() const override;
   int GetButtons() const override;
   base::string16 GetButtonLabel(InfoBarButton button) const override;
   bool Accept() override;
   bool Cancel() override;
   base::string16 GetLinkText() const override;
   GURL GetLinkURL() const override;
   bool LinkClicked(WindowOpenDisposition disposition) override;
   bool EqualsDelegate(infobars::InfoBarDelegate* delegate) const override;
   void InfoBarDismissed() override;
 
   infobars::InfoBar* info_bar_;
   base::WeakPtr<GlobalConfirmInfoBar> global_info_bar_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegateProxy);
 };
 
 GlobalConfirmInfoBar::DelegateProxy::DelegateProxy(
     base::WeakPtr<GlobalConfirmInfoBar> global_info_bar)
     : info_bar_(nullptr),
       global_info_bar_(global_info_bar) {
 }
 
 GlobalConfirmInfoBar::DelegateProxy::~DelegateProxy() {
 }
 
+infobars::InfoBarDelegate::InfoBarIdentifier
+GlobalConfirmInfoBar::DelegateProxy::GetIdentifier() const {
+  return global_info_bar_ ? global_info_bar_->delegate_->GetIdentifier()
+                          : INVALID_ID;

[Peter Kasting, 2015/12/30 01:52:57]

Uggghhhh.  This really shouldn't be needed; I don't think the design of this
class is correct at all.  I filed bug 573088 against myself to understand and
fix up this code.

I'm inclined to suggest that we make INVALID_ID -1 and add a DCHECK in
InfoBarContainer::AddInfoBar() that we don't get this value there (which we
never should, even with this code existing); then I can later rip this out
entirely without leaving a hole at the beginning of the histogram.

I don't just want this for cleanliness; I worry that if we leave this value,
someone later will try to use it for some kind of "infobar that I don't care
about collecting metrics on" and I don't want to leave that possibility.

[gone, 2015/12/30 07:29:03]

Yeah, when I hit this I was a bit confused about why the class was written as it
was.  I've added a DCHECK and changed the INVALID value to -1.  Thanks for
looking into it.

+}
+
 base::string16 GlobalConfirmInfoBar::DelegateProxy::GetMessageText() const {
   return global_info_bar_ ? global_info_bar_->delegate_->GetMessageText()
                           : base::string16();
 }
 
 int GlobalConfirmInfoBar::DelegateProxy::GetButtons() const {
   return global_info_bar_ ? global_info_bar_->delegate_->GetButtons()
                           : 0;
 }
 
@@ skipping 131 matching lines @@
       break;
     }
   }
 }
 
 void GlobalConfirmInfoBar::OnManagerShuttingDown(
     infobars::InfoBarManager* manager) {
   manager->RemoveObserver(this);
   proxies_.erase(manager);
 }