[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..d3f4daa4d66294b47f109c56974b989ed72c9386 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,22 @@ class PushMessagingPermissionContext : public PermissionContextBase {
   explicit PushMessagingPermissionContext(Profile* profile);
   ~PushMessagingPermissionContext() override;
 
+  ContentSetting GetPermissionStatus(

[johnme, 2014/11/13 18:50:06]

Nit: Could you add a "// PermissionContextBase implementation:" comment? Ditto
for the protected override below.

[Miguel Garcia, 2014/11/14 11:34:36]

Done.

+      const GURL& requesting_origin,
+      const GURL& embedding_origin) const override;
+
+ protected:
+  void DecidePermission(content::WebContents* web_contents,
+                        const PermissionRequestID& id,
+                        const GURL& requesting_origin,
+                        const GURL& embedder_origin,
+                        bool user_gesture,
+                        const BrowserPermissionCallback& callback) override;
+
  private:
+  Profile* push_profile_;

[Michael van Ouwerkerk, 2014/11/13 18:35:52]

PermissionContextBase already has this pointer. Why not create a getter for it
there, so all subclasses can use it when needed?

[Miguel Garcia, 2014/11/14 11:34:36]

I don't think subclasses should this need in general and I rather not add extra
methods to the base class that are only needed by Permission classes that are in
flux.

+  ContentSettingsType push_setting_type_;

[Michael van Ouwerkerk, 2014/11/13 18:35:52]

Why is this a member? It is always set to CONTENT_SETTINGS_TYPE_PUSH_MESSAGING
anyway.

[Miguel Garcia, 2014/11/14 11:34:36]

Well, because if we ever change CONTENT_SETTINGS_TYPE_PUSH_MESSAGING to
something else I only need to change it in one place. I've made it const to be
sure it cannot be changed.

[Bernhard Bauer, 2014/11/14 12:31:33]

Couldn't you make it a constant declared in the .cc file?

[Miguel Garcia, 2014/11/17 11:43:22]

Done.

+
   DISALLOW_COPY_AND_ASSIGN(PushMessagingPermissionContext);
 };