Enable Notification permissions to be toggled in Site Settings.

chrome/browser/android/preferences/website_preference_bridge.cc

 // Copyright 2015 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/android/preferences/website_preference_bridge.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/browsing_data/local_data_container.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
+#include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "jni/WebsitePreferenceBridge_jni.h"
 #include "storage/browser/quota/quota_client.h"
 #include "storage/browser/quota/quota_manager.h"
 
 using base::android::ConvertJavaStringToUTF8;
@@ skipping 155 matching lines @@
 }
 
 static void GetPushNotificationOrigins(JNIEnv* env,
                                        jclass clazz,
                                        jobject list) {
   GetOrigins(env, CONTENT_SETTINGS_TYPE_NOTIFICATIONS, list, false);
 }
 
 static jint GetPushNotificationSettingForOrigin(JNIEnv* env, jclass clazz,
     jstring origin, jstring embedder) {
-  return GetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-      origin, embedder);
+  return DesktopNotificationProfileUtil::GetContentSetting(
+      ProfileManager::GetActiveUserProfile(),
+      GURL(ConvertJavaStringToUTF8(env, origin)));
 }
 
 static void SetPushNotificationSettingForOrigin(JNIEnv* env, jclass clazz,
     jstring origin, jstring embedder, jint value) {
-  GURL embedder_url(ConvertJavaStringToUTF8(env, embedder));
-  SetSettingForOrigin(env, CONTENT_SETTINGS_TYPE_NOTIFICATIONS,
-      origin, ContentSettingsPattern::FromURLNoWildcard(embedder_url), value);
+  // TODO(peter): Web Notification permission behaves differently from all other
+  // permission types. See https://crbug.com/416894.
+  Profile* profile = ProfileManager::GetActiveUserProfile();
+  GURL url = GURL(ConvertJavaStringToUTF8(env, origin));
+
+  switch (value) {
+    case -1:
+      DesktopNotificationProfileUtil::ClearSetting(
+          profile, ContentSettingsPattern::FromURLNoWildcard(url));
+      break;
+    case 1:
+      DesktopNotificationProfileUtil::GrantPermission(profile, url);
+      break;
+    case 2:
+      DesktopNotificationProfileUtil::DenyPermission(profile, url);
+      break;
+    default:
+      NOTREACHED();
+  }

[Finnur, 2015/02/13 14:58:46]

I was going to point out that this breaks the Site Settings page (the part that
lists all origins with this permission), but upon closer inspection it looks
like GrantPermission populates the host content settings map as we were doing. I
suppose you did an end-to-end test on this already?

 }
 
 static void GetVoiceAndVideoCaptureOrigins(JNIEnv* env,
                                            jclass clazz,
                                            jobject list,
                                            jboolean managedOnly) {
   GetOrigins(env, CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, list, managedOnly);
   GetOrigins(env, CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, list, managedOnly);
 }
 
@@ skipping 389 matching lines @@
   GURL url(ConvertJavaStringToUTF8(env, jorigin));
   scoped_refptr<SiteDataDeleteHelper> site_data_deleter(
       new SiteDataDeleteHelper(profile, url));
   site_data_deleter->Run();
 }
 
 // Register native methods
 bool RegisterWebsitePreferenceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }