Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

chrome/renderer/content_settings_observer.h

 // 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.
 
 #ifndef CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 #define CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_
 #pragma once
 
 #include <map>
 
@@ skipping 20 matching lines @@
   // allowPlugins().
   void SetContentSettings(const ContentSettings& settings);
 
   // Sets the default content settings that back allowScripts(),
   // allowImages(), and allowPlugins().
   static void SetDefaultContentSettings(const ContentSettings& settings);
 
   // Returns the setting for the given type.
   ContentSetting GetContentSetting(ContentSettingsType type);
 
+  bool plugins_temporarily_allowed() {
+    return plugins_temporarily_allowed_;
+  }
+
   // Sends an IPC notification that the specified content type was blocked.
   // If the content type requires it, |resource_identifier| names the specific
   // resource that was blocked (the plugin path in the case of plugins),
   // otherwise it's the empty string.
   void DidBlockContentType(ContentSettingsType settings_type,
                            const std::string& resource_identifier);
 
   // These correspond to WebKit::WebPermissionClient methods.
   bool AllowDatabase(WebKit::WebFrame* frame,
                      const WebKit::WebString& name,
@@ skipping 46 matching lines @@
   // Caches the result of AllowStorage.
   typedef std::pair<GURL, bool> StoragePermissionsKey;
   std::map<StoragePermissionsKey, bool> cached_storage_permissions_;
 
   bool plugins_temporarily_allowed_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsObserver);
 };
 
 #endif  // CHROME_RENDERER_CONTENT_SETTINGS_OBSERVER_H_