Add a default content setting to the notifications service.

chrome/browser/notifications/notifications_prefs_cache.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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/notifications/notifications_prefs_cache.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/pref_service.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebNotificationPresenter.h"
 
 NotificationsPrefsCache::NotificationsPrefsCache()
-        : is_initialized_(false) {
+        : default_content_setting_(CONTENT_SETTING_DEFAULT),
+          is_initialized_(false) {
 }
 
 void NotificationsPrefsCache::CacheAllowedOrigin(
     const GURL& origin) {
   CheckThreadAccess();
   std::set<GURL>::iterator iter;
   allowed_origins_.insert(origin);
   if ((iter = denied_origins_.find(origin)) != denied_origins_.end())
     denied_origins_.erase(iter);
 }
@@ skipping 12 matching lines @@
   allowed_origins_.clear();
   allowed_origins_.insert(allowed.begin(), allowed.end());
 }
 
 void NotificationsPrefsCache::SetCacheDeniedOrigins(
     const std::vector<GURL>& denied) {
   denied_origins_.clear();
   denied_origins_.insert(denied.begin(), denied.end());
 }
 
+void NotificationsPrefsCache::SetCacheDefaultContentSetting(
+    ContentSetting setting) {
+  default_content_setting_ = setting;
+}
+
 // static
 void NotificationsPrefsCache::ListValueToGurlVector(
     const ListValue& origin_list,
     std::vector<GURL>* origin_vector) {
   ListValue::const_iterator i;
   std::wstring origin;
   for (i = origin_list.begin(); i != origin_list.end(); ++i) {
     (*i)->GetAsString(&origin);
     origin_vector->push_back(GURL(WideToUTF8(origin)));
   }
 }
 
 int NotificationsPrefsCache::HasPermission(const GURL& origin) {
   if (IsOriginAllowed(origin))
     return WebKit::WebNotificationPresenter::PermissionAllowed;
   if (IsOriginDenied(origin))
     return WebKit::WebNotificationPresenter::PermissionDenied;
-  return WebKit::WebNotificationPresenter::PermissionNotAllowed;
+  switch (default_content_setting_) {
+    case CONTENT_SETTING_ALLOW:
+      return WebKit::WebNotificationPresenter::PermissionAllowed;
+    case CONTENT_SETTING_BLOCK:
+      return WebKit::WebNotificationPresenter::PermissionDenied;
+    case CONTENT_SETTING_ASK:
+    case CONTENT_SETTING_DEFAULT:
+    default:  // Make gcc happy.
+      return WebKit::WebNotificationPresenter::PermissionNotAllowed;
+  }
 }
 
 bool NotificationsPrefsCache::IsOriginAllowed(
     const GURL& origin) {
   CheckThreadAccess();
-  return (allowed_origins_.find(origin) != allowed_origins_.end());
+  return allowed_origins_.find(origin) != allowed_origins_.end();
 }
 
 bool NotificationsPrefsCache::IsOriginDenied(
     const GURL& origin) {
   CheckThreadAccess();
-  return (denied_origins_.find(origin) != denied_origins_.end());
+  return denied_origins_.find(origin) != denied_origins_.end();
 }
 
 void NotificationsPrefsCache::CheckThreadAccess() {
   if (is_initialized_) {
     DCHECK(ChromeThread::CurrentlyOn(ChromeThread::IO));
   } else {
     DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
   }
 }