[PUSH] Merge notifications and push messaging prompts

chrome/browser/services/gcm/push_messaging_permission_context.h

Index: chrome/browser/services/gcm/push_messaging_permission_context.h
diff --git a/chrome/browser/services/gcm/push_messaging_permission_context.h b/chrome/browser/services/gcm/push_messaging_permission_context.h
index 819f41e0df2643994de542e1a38e6390bcfa0bea..9ec4e2769a59b6dad5f7d8b0a96f2342691d8ac6 100644
--- a/chrome/browser/services/gcm/push_messaging_permission_context.h
+++ b/chrome/browser/services/gcm/push_messaging_permission_context.h
@@ -7,6 +7,10 @@
 
 #include "chrome/browser/content_settings/permission_context_base.h"
 
+#include "components/content_settings/core/common/content_settings_types.h"
+
+class Profile;
+
 namespace gcm {
 
 // Permission context for push messages.
@@ -15,7 +19,23 @@ class PushMessagingPermissionContext : public PermissionContextBase {
   explicit PushMessagingPermissionContext(Profile* profile);
   ~PushMessagingPermissionContext() override;
 
+  // PermissionContextBase:
+  ContentSetting GetPermissionStatus(
+      const GURL& requesting_origin,
+      const GURL& embedding_origin) const override;
+
+ protected:
+  // PermissionContextBase:
+  void DecidePermission(content::WebContents* web_contents,
+                        const PermissionRequestID& id,
+                        const GURL& requesting_origin,
+                        const GURL& embedding_origin,
+                        bool user_gesture,
+                        const BrowserPermissionCallback& callback) override;
+
  private:
+  Profile* push_profile_;

[Michael van Ouwerkerk, 2014/11/17 14:50:09]

Can you not call this |profile_| ?

[Miguel Garcia, 2014/11/18 10:47:30]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(PushMessagingPermissionContext);
 };