[PUSH] Merge notifications and push messaging prompts

chrome/browser/content_settings/permission_context_base.h

 // Copyright 2014 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_CONTENT_SETTINGS_PERMISSION_CONTEXT_BASE_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_CONTEXT_BASE_H_
 
 #include "base/callback.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/ref_counted.h"
@@ skipping 60 matching lines @@
 
   // Withdraw an existing permission request, no op if the permission request
   // was already cancelled by some other means.
   virtual void CancelPermissionRequest(content::WebContents* web_contents,
                                        const PermissionRequestID& id);
 
  protected:
   // Decide whether the permission should be granted.
   // Calls PermissionDecided if permission can be decided non-interactively,
   // or NotifyPermissionSet if permission decided by presenting an infobar.
-  void DecidePermission(content::WebContents* web_contents,
-                        const PermissionRequestID& id,
-                        const GURL& requesting_origin,
-                        const GURL& embedder_origin,
-                        bool user_gesture,
-                        const BrowserPermissionCallback& callback);
+  virtual void DecidePermission(content::WebContents* web_contents,
+                                const PermissionRequestID& id,
+                                const GURL& requesting_origin,
+                                const GURL& embedding_origin,
+                                bool user_gesture,
+                                const BrowserPermissionCallback& callback);
 
   // Called when permission is granted without interactively asking the user.
   void PermissionDecided(const PermissionRequestID& id,
                          const GURL& requesting_origin,
-                         const GURL& embedder_origin,
+                         const GURL& embedding_origin,
                          const BrowserPermissionCallback& callback,
                          bool persist,
                          bool allowed);
 
-  void NotifyPermissionSet(const PermissionRequestID& id,
-                           const GURL& requesting_origin,
-                           const GURL& embedder_origin,
-                           const BrowserPermissionCallback& callback,
-                           bool persist,
-                           bool allowed);
+  virtual void NotifyPermissionSet(const PermissionRequestID& id,
+                                   const GURL& requesting_origin,
+                                   const GURL& embedding_origin,
+                                   const BrowserPermissionCallback& callback,
+                                   bool persist,
+                                   bool allowed);
 
   // Implementors can override this method to update the icons on the
   // url bar with the result of the new permission.
   virtual void UpdateTabContext(const PermissionRequestID& id,
                                 const GURL& requesting_origin,
                                 bool allowed) {}
 
   // Return an instance of the infobar queue controller, creating it if needed.
   PermissionQueueController* GetQueueController();
 
   // Store the decided permission as a content setting.
   // virtual since the permission might be stored with different restrictions
   // (for example for desktop notifications).
   virtual void UpdateContentSetting(const GURL& requesting_origin,
-                                    const GURL& embedder_origin,
+                                    const GURL& embedding_origin,
                                     bool allowed);
 
  private:
-
   // Called when a bubble is no longer used so it can be cleaned up.
   void CleanUpBubble(const PermissionRequestID& id);
 
   Profile* profile_;
   const ContentSettingsType permission_type_;
   scoped_ptr<PermissionQueueController> permission_queue_controller_;
   base::ScopedPtrHashMap<std::string, PermissionBubbleRequest>
       pending_bubbles_;
 
   // Must be the last member, to ensure that it will be
   // destroyed first, which will invalidate weak pointers
   base::WeakPtrFactory<PermissionContextBase> weak_factory_;
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_PERMISSION_CONTEXT_BASE_H_