Change infobar creation to use a public static Create() method on the infobar delegate classes.

chrome/browser/notifications/desktop_notification_service.cc

 // 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.
 
 #include "chrome/browser/notifications/desktop_notification_service.h"
 
 #include "base/metrics/histogram.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
@@ skipping 41 matching lines @@
 using WebKit::WebSecurityOrigin;
 
 const ContentSetting kDefaultSetting = CONTENT_SETTING_ASK;
 
 // NotificationPermissionInfoBarDelegate --------------------------------------
 
 // The delegate for the infobar shown when an origin requests notification
 // permissions.
 class NotificationPermissionInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
+  // Creates a notification permission delegate and adds it to
+  // |infobar_service|.
+  static void Create(InfoBarService* infobar_service,
+                     DesktopNotificationService* notification_service,
+                     const GURL& origin,
+                     const string16& display_name,
+                     int process_id,
+                     int route_id,
+                     int callback_context);
+
+ private:
   NotificationPermissionInfoBarDelegate(
       InfoBarService* infobar_service,
       DesktopNotificationService* notification_service,
       const GURL& origin,
       const string16& display_name,
       int process_id,
       int route_id,
       int callback_context);
-
- private:
   virtual ~NotificationPermissionInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
 
@@ skipping 12 matching lines @@
   int process_id_;
   int route_id_;
   int callback_context_;
 
   // Whether the user clicked one of the buttons.
   bool action_taken_;
 
   DISALLOW_COPY_AND_ASSIGN(NotificationPermissionInfoBarDelegate);
 };
 
+// static
+void NotificationPermissionInfoBarDelegate::Create(
+    InfoBarService* infobar_service,
+    DesktopNotificationService* notification_service,
+    const GURL& origin,
+    const string16& display_name,
+    int process_id,
+    int route_id,
+    int callback_context) {
+  infobar_service->AddInfoBar(scoped_ptr<InfoBarDelegate>(
+      new NotificationPermissionInfoBarDelegate(
+          infobar_service, notification_service, origin, display_name,
+          process_id, route_id, callback_context)));
+}
+
 NotificationPermissionInfoBarDelegate::NotificationPermissionInfoBarDelegate(
     InfoBarService* infobar_service,
     DesktopNotificationService* notification_service,
     const GURL& origin,
     const string16& display_name,
     int process_id,
     int route_id,
     int callback_context)
     : ConfirmInfoBarDelegate(infobar_service),
       origin_(origin),
@@ skipping 295 matching lines @@
   // so don't ask the cache.
   ContentSetting setting = GetContentSetting(origin);
   if (setting == CONTENT_SETTING_ASK) {
     // Show an info bar requesting permission.
     InfoBarService* infobar_service =
         InfoBarService::FromWebContents(contents);
     // |infobar_service| may be NULL, e.g., if this request originated in a
     // browser action popup, extension background page, or any HTML that runs
     // outside of a tab.
     if (infobar_service) {
-      infobar_service->AddInfoBar(new NotificationPermissionInfoBarDelegate(
+      NotificationPermissionInfoBarDelegate::Create(
           infobar_service,
           DesktopNotificationServiceFactory::GetForProfile(
               Profile::FromBrowserContext(contents->GetBrowserContext())),
           origin,
           DisplayNameForOrigin(origin),
           process_id,
           route_id,
-          callback_context));
+          callback_context);
       return;
     }
   }
 
   // Notify renderer immediately.
   RenderViewHost* host = RenderViewHost::FromID(process_id, route_id);
   if (host)
     host->DesktopNotificationPermissionRequestDone(callback_context);
 }
 
@@ skipping 82 matching lines @@
 
   if (setting == CONTENT_SETTING_ALLOW)
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (setting == CONTENT_SETTING_BLOCK)
     return WebKit::WebNotificationPresenter::PermissionDenied;
   if (setting == CONTENT_SETTING_ASK)
     return WebKit::WebNotificationPresenter::PermissionNotAllowed;
   NOTREACHED() << "Invalid notifications settings value: " << setting;
   return WebKit::WebNotificationPresenter::PermissionNotAllowed;
 }