Group the different permission related methods in the content api.

chrome/browser/notifications/desktop_notification_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_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 38 matching lines @@
 namespace gfx {
 class Image;
 }
 
 namespace user_prefs {
 class PrefRegistrySyncable;
 }
 
 // Callback to be invoked when the result of a permission request is known.
 typedef base::Callback<void(blink::WebNotificationPermission)>
     NotificationPermissionCallback;

[Peter Beverloo, 2014/10/20 17:32:16]

Remove this |typedef| if we're not going to use it anymore.

[Miguel Garcia, 2014/10/21 17:17:12]

Done.

 
 // The DesktopNotificationService is an object, owned by the Profile,
 // which provides the creation of desktop "toasts" to web pages and workers.
 class DesktopNotificationService : public PermissionContextBase
 #if defined(ENABLE_EXTENSIONS)
                                    ,
                                    public extensions::ExtensionRegistryObserver
 #endif
                                    {
  public:
@@ skipping 12 matching lines @@
   explicit DesktopNotificationService(Profile* profile);
   virtual ~DesktopNotificationService();
 
   // Requests Web Notification permission for |requesting_frame|. The |callback|
   // will be invoked after the user has made a decision.
   void RequestNotificationPermission(
       content::WebContents* web_contents,
       const PermissionRequestID& request_id,
       const GURL& requesting_origin,
       bool user_gesture,
-      const NotificationPermissionCallback& callback);
+      const base::Callback<void(bool)>& result_callback);
 
   // Show a desktop notification. If |cancel_callback| is non-null, it's set to
   // a callback which can be used to cancel the notification.
   void ShowDesktopNotification(
       const content::ShowDesktopNotificationHostMsgParams& params,
       content::RenderFrameHost* render_frame_host,
       scoped_ptr<content::DesktopNotificationDelegate> delegate,
       base::Closure* cancel_callback);
 
   // Returns true if the notifier with |notifier_id| is allowed to send
@@ skipping 11 matching lines @@
   base::string16 DisplayNameForOriginInProcessId(const GURL& origin,
                                                  int process_id);
 
   // Called when the string list pref has been changed.
   void OnStringListPrefChanged(
       const char* pref_name, std::set<std::string>* ids_field);
 
   // Called when the disabled_extension_id pref has been changed.
   void OnDisabledExtensionIdsChanged();
 
-  // Used as a callback once a permission has been decided to convert |allowed|
-  // to one of the blink::WebNotificationPermission values.
-  void OnNotificationPermissionRequested(
-      const base::Callback<void(blink::WebNotificationPermission)>& callback,
-      bool allowed);
-
   void FirePermissionLevelChangedEvent(
       const message_center::NotifierId& notifier_id,
       bool enabled);
 
 #if defined(ENABLE_EXTENSIONS)
   // extensions::ExtensionRegistryObserver:
   virtual void OnExtensionUninstalled(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
       extensions::UninstallReason reason) override;
@@ skipping 25 matching lines @@
                  extensions::ExtensionRegistryObserver>
       extension_registry_observer_;
 #endif
 
   base::WeakPtrFactory<DesktopNotificationService> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopNotificationService);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATION_SERVICE_H_