Introduce InfoBarTabService API.

chrome/browser/api/infobars/infobar_delegate.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_API_INFOBARS_INFOBAR_DELEGATE_H_
 #define CHROME_BROWSER_API_INFOBARS_INFOBAR_DELEGATE_H_
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutoLoginInfoBarDelegate;
 class ConfirmInfoBarDelegate;
 class ExtensionInfoBarDelegate;
 class InfoBar;
-class InfoBarTabHelper;
+class InfoBarTabService;
 class InsecureContentInfoBarDelegate;
 class LinkInfoBarDelegate;
 class MediaStreamInfoBarDelegate;
 class PluginInstallerInfoBarDelegate;
 class RegisterProtocolHandlerInfoBarDelegate;
 class SavePasswordInfoBarDelegate;
 class ThemeInstalledInfoBarDelegate;
 class TranslateInfoBarDelegate;
 
 namespace gfx {
@@ skipping 24 matching lines @@
     RPH_INFOBAR,
     UNKNOWN_INFOBAR,
   };
 
   virtual ~InfoBarDelegate();
 
   virtual InfoBarAutomationType GetInfoBarAutomationType() const;
 
   // Called to create the InfoBar. Implementation of this method is
   // platform-specific.
-  virtual InfoBar* CreateInfoBar(InfoBarTabHelper* owner) = 0;
-
-  // Called by the InfoBarTabHelper when it removes us.
-  void clear_owner() { owner_ = NULL; }
+  virtual InfoBar* CreateInfoBar(InfoBarTabService* owner) = 0;
 
   // TODO(pkasting): Move to InfoBar once InfoBars own their delegates.
-  InfoBarTabHelper* owner() { return owner_; }
+  InfoBarTabService* owner() { return owner_; }
 
   // Returns true if the supplied |delegate| is equal to this one. Equality is
   // left to the implementation to define. This function is called by the
-  // InfoBarTabHelper when determining whether or not a delegate should be
+  // InfoBarTabService when determining whether or not a delegate should be
   // added because a matching one already exists. If this function returns true,
   // the InfoBarTabHelper will not add the new delegate because it considers

[erikwright (departed), 2012/08/16 17:25:38]

Helper->Service

[Jói, 2012/08/17 15:51:24]

Done.

   // one to already be present.
   virtual bool EqualsDelegate(InfoBarDelegate* delegate) const;
 
   // Returns true if the InfoBar should be closed automatically after the page
   // is navigated. By default this returns true if the navigation is to a new
   // page (not including reloads).  Subclasses wishing to change this behavior
   // can override either this function or ShouldExpireInternal(), depending on
   // what level of control they need.
   virtual bool ShouldExpire(const content::LoadCommittedDetails& details) const;
 
@@ skipping 20 matching lines @@
   virtual LinkInfoBarDelegate* AsLinkInfoBarDelegate();
   virtual MediaStreamInfoBarDelegate* AsMediaStreamInfoBarDelegate();
   virtual RegisterProtocolHandlerInfoBarDelegate*
       AsRegisterProtocolHandlerInfoBarDelegate();
   virtual ThemeInstalledInfoBarDelegate* AsThemePreviewInfobarDelegate();
   virtual TranslateInfoBarDelegate* AsTranslateInfoBarDelegate();
 
  protected:
   // If |contents| is non-NULL, its active entry's unique ID will be stored
   // using StoreActiveEntryUniqueID automatically.
-  explicit InfoBarDelegate(InfoBarTabHelper* infobar_helper);
+  explicit InfoBarDelegate(InfoBarTabService* infobar_helper);

[erikwright (departed), 2012/08/16 17:25:38]

rename

[Jói, 2012/08/17 15:51:24]

Done.

 
   // Store the unique id for the active entry in the specified WebContents, to
   // be used later upon navigation to determine if this InfoBarDelegate should
   // be expired from |contents_|.
-  void StoreActiveEntryUniqueID(InfoBarTabHelper* infobar_helper);
+  void StoreActiveEntryUniqueID(InfoBarTabService* infobar_helper);

[erikwright (departed), 2012/08/16 17:25:38]

rename

[Jói, 2012/08/17 15:51:24]

Done.

 
   // Direct accessors for subclasses that need to do something special.
   int contents_unique_id() const { return contents_unique_id_; }
   void set_contents_unique_id(int contents_unique_id) {
     contents_unique_id_ = contents_unique_id;
   }
 
   // Returns true if the navigation is to a new URL or a reload occured.
   virtual bool ShouldExpireInternal(
       const content::LoadCommittedDetails& details) const;
 
   // Removes ourself from |owner_| if we haven't already been removed.
   // TODO(pkasting): Move to InfoBar.
   void RemoveSelf();
 
  private:
+  friend class InfoBarTabHelper;
+
+  // Called by the InfoBarTabHelper when it removes us.
+  void clear_owner() { owner_ = NULL; }

[erikwright (departed), 2012/08/16 17:25:38]

This implies that one could not simply write an alternative implementation of
InfoBarTabService using this API.

I think it would be better to leave clear_owner public.

[Jói, 2012/08/17 15:51:24]

Moved it back to public.  Removed the comment.

+
   // The unique id of the active NavigationEntry of the WebContents that we were
   // opened for. Used to help expire on navigations.
   int contents_unique_id_;
 
   // TODO(pkasting): Remove.
-  InfoBarTabHelper* owner_;
+  InfoBarTabService* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_API_INFOBARS_INFOBAR_DELEGATE_H_