Audit the last usage of Geolocation and Notification permissions.

chrome/browser/chrome_content_browser_client.cc

 // 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 105 matching lines @@
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_descriptors.h"
+#include "content/public/common/show_desktop_notification_params.h"
 #include "content/public/common/url_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_message_filter.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/process_map.h"
 #include "extensions/browser/view_type_utils.h"
 #include "extensions/common/constants.h"
@@ skipping 1955 matching lines @@
     RenderFrameHost* render_frame_host,
     content::DesktopNotificationDelegate* delegate,
     base::Closure* cancel_callback) {
 #if defined(ENABLE_NOTIFICATIONS)
   content::RenderProcessHost* process = render_frame_host->GetProcess();
   Profile* profile = Profile::FromBrowserContext(process->GetBrowserContext());
   DesktopNotificationService* service =
       DesktopNotificationServiceFactory::GetForProfile(profile);
   service->ShowDesktopNotification(
       params, render_frame_host, delegate, cancel_callback);
+
+  UseContentSettingPermissionHelper(
+      profile,
+      params.origin,
+      params.origin,
+      content_settings::GetTypeName(CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
 #else
   NOTIMPLEMENTED();
 #endif
 }
 
 void ChromeContentBrowserClient::RequestGeolocationPermission(
     content::WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame,
     bool user_gesture,
@@ skipping 14 matching lines @@
     base::Callback<void(bool)> result_callback,
     base::Closure* cancel_callback) {
   MidiPermissionContext* context =
       MidiPermissionContextFactory::GetForProfile(
           Profile::FromBrowserContext(web_contents->GetBrowserContext()));
   context->RequestMidiSysExPermission(web_contents, bridge_id, requesting_frame,
                                       user_gesture, result_callback,
                                       cancel_callback);
 }
 
+void ChromeContentBrowserClient::UseContentSettingPermission(
+    content::WebContents* web_contents,
+    const GURL& primary_url,
+    const GURL& secondary_url,
+    const std::string& setting_type) {
+  UseContentSettingPermissionHelper(
+      Profile::FromBrowserContext(web_contents->GetBrowserContext()),
+      primary_url,
+      secondary_url,
+      setting_type);
+}
+
+void ChromeContentBrowserClient::UseContentSettingPermissionHelper(

[Michael van Ouwerkerk, 2014/07/01 11:02:23]

Why do you need this method? It makes one simple call to UpdateLastUsage, why
not call that directly? Furthermore, the 'Helper' part of its name seems
strange, more suitable for a class name, for which there is precedence.

[Daniel Nishi, 2014/07/01 18:37:48]

|UseContentSettingPermission| is called from content/browser and the Profile is
part of Chrome, so I had the call use the WebContents.

We also call the second function from
|ChromeContentBrowserClient::ShowDesktopNotification| which has a Profile and
needs up update the last usage as well.

Thinking about it, though, since it is just one simple call, this second
function could be eliminated.

Done.

+    Profile* profile,
+    const GURL& primary_url,
+    const GURL& secondary_url,
+    const std::string& setting_type) {
+  profile->GetHostContentSettingsMap()->UpdateLastUsage(
+      primary_url,
+      secondary_url,
+      content_settings::GetTypeFromName(setting_type));
+}
+
 void ChromeContentBrowserClient::RequestProtectedMediaIdentifierPermission(
     content::WebContents* web_contents,
     const GURL& origin,
     base::Callback<void(bool)> result_callback,
     base::Closure* cancel_callback) {
 #if defined(OS_ANDROID)
   ProtectedMediaIdentifierPermissionContext* context =
       ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
           Profile::FromBrowserContext(web_contents->GetBrowserContext()));
   context->RequestProtectedMediaIdentifierPermission(web_contents,
@@ skipping 658 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome