Policy: Re-enabled plugin still disabled

webkit/glue/plugins/plugin_group.h

 // 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.
 
 #ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
 #define WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_
 #pragma once
 
+#include <list>
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 
 class DictionaryValue;
@@ skipping 73 matching lines @@
 
   // Tests to see if a plugin is on the blacklist using its path as
   // the lookup key.
   static bool IsPluginPathDisabledByPolicy(const FilePath& plugin_path);
 
   // Returns true if the given plugin matches this group.
   bool Match(const WebPluginInfo& plugin) const;
 
   // Adds the given plugin to this group. Provide the position of the
   // plugin as given by PluginList so we can display its priority.
-  void AddPlugin(const WebPluginInfo& plugin, int position);
+  // Retuns true if plugin has been added and false if it was already added.
+  bool AddPlugin(const WebPluginInfo& plugin,
+                 int position,
+                 WebPluginInfo** group_plugin_copy);

[Bernhard Bauer, 2010/12/15 17:23:45]

Nit: Can you explain what |group_plugin_copy| is for?

+
+  // Returns a poitner to the plugin at the end of the |web_plugin_infos_|

[Bernhard Bauer, 2010/12/15 17:23:45]

Nit: Pointer. Also, it's a reference. Also, make it const?

+  // array.
+  std::list<WebPluginInfo>& GetPlugins();
+
+  // Returns the positions of the plugins in the group.
+  std::vector<int>& GetPluginPositions();
 
   // Enables/disables this group. This enables/disables all plugins in the
   // group.
   void Enable(bool enable);
 
+  // Refreshes the enabled flag based on the state of its plugins.
+  void RefreshEnabledState();
+
   // Returns whether the plugin group is enabled or not.
   bool Enabled() const { return enabled_; }
 
   // Returns a unique identifier for this group, if one is defined, or the empty
   // string otherwise.
   const std::string& identifier() const { return identifier_; }
 
   // Returns this group's name, or the filename without extension if the name
   // is empty.
   string16 GetGroupName() const;
@@ skipping 71 matching lines @@
   static std::set<string16>* policy_disabled_plugin_patterns_;
 
   std::string identifier_;
   string16 group_name_;
   string16 name_matcher_;
   string16 description_;
   std::string update_url_;
   bool enabled_;
   std::vector<VersionRange> version_ranges_;
   scoped_ptr<Version> version_;
-  std::vector<WebPluginInfo> web_plugin_infos_;
+  std::list<WebPluginInfo> web_plugin_infos_;

[jam, 2010/12/15 19:48:55]

I don't understand why this was changed into a list?  I don't see items being
removed from it, so why is a vector not good enough?

[pastarmovj, 2010/12/15 21:56:04]

Because pointers to elements of a vector might get invalidated if the vector is
resized (which did happen all the time). So in order to make that adding new
elements won't invalidate pointers to old ones we decided to make it a list.

   std::vector<int> web_plugin_positions_;
 };
 
 #endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_GROUP_H_