Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(74)

Side by Side Diff: chrome/browser/plugins/plugin_finder.h

Issue 11016005: Using MIME types in addition to plugin name to differentiate between plugins. (Closed) Base URL: http://git.chromium.org/chromium/src.git@5_plugins_resource_service
Patch Set: fixed error Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/plugins/plugin_finder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_ 5 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_
6 #define CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_ 6 #define CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 void InitInternal(); 80 void InitInternal();
81 81
82 scoped_ptr<base::DictionaryValue> plugin_list_; 82 scoped_ptr<base::DictionaryValue> plugin_list_;
83 #if defined(ENABLE_PLUGIN_INSTALLATION) 83 #if defined(ENABLE_PLUGIN_INSTALLATION)
84 std::map<std::string, PluginInstaller*> installers_; 84 std::map<std::string, PluginInstaller*> installers_;
85 #endif 85 #endif
86 86
87 std::map<std::string, PluginMetadata*> identifier_plugin_; 87 std::map<std::string, PluginMetadata*> identifier_plugin_;
88 88
89 // Note: Don't free memory for |name_plugin_| values
90 // since it holds pointers to same instances
91 // in |identifier_plugin_| (Double De-allocation).
92 std::map<string16, PluginMetadata*> name_plugin_;
93
94 // Synchronization for the above member variables is 89 // Synchronization for the above member variables is
95 // required since multiple threads can be accessing them concurrently. 90 // required since multiple threads can be accessing them concurrently.
96 base::Lock mutex_; 91 base::Lock mutex_;
97 92
98 DISALLOW_COPY_AND_ASSIGN(PluginFinder); 93 DISALLOW_COPY_AND_ASSIGN(PluginFinder);
99 }; 94 };
100 95
101 #endif // CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_ 96 #endif // CHROME_BROWSER_PLUGINS_PLUGIN_FINDER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/plugins/plugin_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698