Remove dependency of infobars component on the embedder

chrome/browser/infobars/infobar_service.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_INFOBARS_INFOBAR_SERVICE_H_
 #define CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 27 matching lines @@
       infobars::InfoBar* infobar);
 
   // Makes it so the next reload is ignored. That is, if the next commit is a
   // reload then it is treated as if nothing happened and no infobars are
   // attempted to be closed.
   // This is useful for non-user triggered reloads that should not dismiss
   // infobars. For example, instant may trigger a reload when the google URL
   // changes.
   void set_ignore_next_reload() { ignore_next_reload_ = true; }
 
+  // InfoBarManager:

[Peter Kasting, 2014/12/19 23:06:23]

Why make these public instead of private?

Normally I try to default to "as private as possible" for overriding
implementations.

Same comment on the protected methods below.

[sdefresne, 2014/12/20 11:30:55]

I need to make CreateConfirmInfoBar() public since most of the client code have
InfoBarService* and not infobars::InfoBarManager*. If the method is private in
InfoBarService* then they cannot call it.

I considered leaving the method private and changing all the client code to use
infobars::InfoBarManager* instead but this made the CL even larger. For the
moment, I'll only leave CreateConfirmInfoBar() public, with a comment to turn it
back private once all client code has been fixed.

[Peter Kasting, 2014/12/22 19:22:05]

It may not be good to make all clients use an InfoBarManager*.  I suspect some
of them on the chrome side need to call InfoBarService-only methods.

If that's not true then maybe the conversion you propose would work.

In any case, that explains making CreateConfirmInfoBar() protected, but not the
other methods.

+  int GetActiveEntryID() override;
+  scoped_ptr<infobars::InfoBar> CreateConfirmInfoBar(
+      scoped_ptr<ConfirmInfoBarDelegate> delegate) override;
+
+ protected:
+  // InfoBarManager:
+  // TODO(droger): Remove these functions once infobar notifications are
+  // removed. See http://crbug.com/354380
+  void NotifyInfoBarAdded(infobars::InfoBar* infobar) override;
+  void NotifyInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override;
+
  private:
   friend class content::WebContentsUserData<InfoBarService>;
 
   explicit InfoBarService(content::WebContents* web_contents);
   ~InfoBarService() override;
 
-  // InfoBarManager:
-  int GetActiveEntryID() override;
-  // TODO(droger): Remove these functions once infobar notifications are
-  // removed. See http://crbug.com/354380
-  void NotifyInfoBarAdded(infobars::InfoBar* infobar) override;
-  void NotifyInfoBarRemoved(infobars::InfoBar* infobar, bool animate) override;
-
   // content::WebContentsObserver:
   void RenderProcessGone(base::TerminationStatus status) override;
   void DidStartNavigationToPendingEntry(
       const GURL& url,
       content::NavigationController::ReloadType reload_type) override;
   void NavigationEntryCommitted(
       const content::LoadCommittedDetails& load_details) override;
   void WebContentsDestroyed() override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // Message handlers.
   void OnDidBlockDisplayingInsecureContent();
   void OnDidBlockRunningInsecureContent();
 
   // See description in set_ignore_next_reload().
   bool ignore_next_reload_;
 
   DISALLOW_COPY_AND_ASSIGN(InfoBarService);
 };
 
 #endif  // CHROME_BROWSER_INFOBARS_INFOBAR_SERVICE_H_