Block plugins for platform apps

chrome/browser/content_settings/host_content_settings_map.cc

 // Copyright (c) 2011 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/content_settings/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/content_settings/content_settings_default_provider.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/content_settings_extension_provider.h"
 #include "chrome/browser/content_settings/content_settings_observable_provider.h"
+#include "chrome/browser/content_settings/content_settings_platform_app_provider.h"
 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
@@ skipping 11 matching lines @@
 using content::BrowserThread;
 using content::UserMetricsAction;
 
 namespace {
 
 typedef std::vector<content_settings::Rule> Rules;
 
 typedef std::pair<std::string, std::string> StringPair;
 
 const char* kProviderNames[] = {
+  "platform_app",
   "policy",
   "extension",
   "preference",
   "default"
 };
 
 content_settings::SettingSource kProviderSourceMap[] = {
+  content_settings::SETTING_SOURCE_EXTENSION,
   content_settings::SETTING_SOURCE_POLICY,
   content_settings::SETTING_SOURCE_EXTENSION,
   content_settings::SETTING_SOURCE_USER,
   content_settings::SETTING_SOURCE_USER,
 };
 COMPILE_ASSERT(arraysize(kProviderSourceMap) ==
                    HostContentSettingsMap::NUM_PROVIDER_TYPES,
                kProviderSourceMap_has_incorrect_size);
 
 bool ContentTypeHasCompoundValue(ContentSettingsType type) {
@@ skipping 10 matching lines @@
 }
 
 }  // namespace
 
 HostContentSettingsMap::HostContentSettingsMap(
     PrefService* prefs,
     ExtensionService* extension_service,
     bool incognito)
     : prefs_(prefs),
       is_off_the_record_(incognito) {
+  content_settings::PlatformAppProvider* platform_app_provider =
+      new content_settings::PlatformAppProvider();
+  content_settings_providers_[PLATFORM_APP_PROVIDER] = platform_app_provider;
+
   content_settings::ObservableProvider* policy_provider =
       new content_settings::PolicyProvider(prefs_);
   policy_provider->AddObserver(this);
   content_settings_providers_[POLICY_PROVIDER] = policy_provider;
 
   if (extension_service) {
     // |extension_service| can be NULL in unit tests.
     content_settings::ObservableProvider* extension_provider =
         new content_settings::ExtensionProvider(
             extension_service->GetExtensionContentSettingsStore(),
@@ skipping 303 matching lines @@
 
 bool HostContentSettingsMap::ShouldAllowAllContent(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type) {
   if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS ||
       content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
     return false;
   }
   if (primary_url.SchemeIs(chrome::kExtensionScheme)) {
-    return content_type != CONTENT_SETTINGS_TYPE_COOKIES ||
-        secondary_url.SchemeIs(chrome::kExtensionScheme);
+    return content_type != CONTENT_SETTINGS_TYPE_PLUGINS &&

[benwells, 2012/01/27 04:03:52]

Mihai: do you know if its OK to stop whitelisting plugins for extension pages?

[Mihai Parparita -not on Chrome, 2012/01/28 00:17:02]

I don't know the full story for this restriction (looks like
http://crrev.com/38536 added it, but the NTP doesn't need plugins).

Based on http://crrbug.com/110900, it looks like the current state is a bit
broken already (extensions still trigger the plugin infobar).

+        (content_type != CONTENT_SETTINGS_TYPE_COOKIES ||
+            secondary_url.SchemeIs(chrome::kExtensionScheme));
   }
   return primary_url.SchemeIs(chrome::kChromeDevToolsScheme) ||
          primary_url.SchemeIs(chrome::kChromeInternalScheme) ||
          primary_url.SchemeIs(chrome::kChromeUIScheme);
 }
 
 base::Value* HostContentSettingsMap::GetWebsiteSetting(
     const GURL& primary_url,
     const GURL& secondary_url,
     ContentSettingsType content_type,
@@ skipping 35 matching lines @@
     }
   }
 
   if (info) {
     info->source = content_settings::SETTING_SOURCE_NONE;
     info->primary_pattern = ContentSettingsPattern();
     info->secondary_pattern = ContentSettingsPattern();
   }
   return NULL;
 }