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

Side by Side Diff: webkit/plugins/npapi/plugin_list.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « webkit/glue/webmediaplayer_impl.cc ('k') | webkit/plugins/npapi/plugin_list.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 5 #ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
6 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 6 #define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/file_path.h" 13 #include "base/file_path.h"
14 #include "base/linked_ptr.h" 14 #include "base/linked_ptr.h"
15 #include "base/lock.h" 15 #include "base/synchronization/lock.h"
16 #include "third_party/npapi/bindings/nphostapi.h" 16 #include "third_party/npapi/bindings/nphostapi.h"
17 #include "webkit/plugins/npapi/plugin_group.h" 17 #include "webkit/plugins/npapi/plugin_group.h"
18 #include "webkit/plugins/npapi/webplugininfo.h" 18 #include "webkit/plugins/npapi/webplugininfo.h"
19 19
20 class GURL; 20 class GURL;
21 21
22 namespace base { 22 namespace base {
23 23
24 template <typename T> 24 template <typename T>
25 struct DefaultLazyInstanceTraits; 25 struct DefaultLazyInstanceTraits;
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 329
330 bool disable_outdated_plugins_; 330 bool disable_outdated_plugins_;
331 331
332 // Holds the currently available plugin groups. 332 // Holds the currently available plugin groups.
333 PluginGroup::PluginMap plugin_groups_; 333 PluginGroup::PluginMap plugin_groups_;
334 334
335 int next_priority_; 335 int next_priority_;
336 336
337 // Need synchronization for the above members since this object can be 337 // Need synchronization for the above members since this object can be
338 // accessed on multiple threads. 338 // accessed on multiple threads.
339 Lock lock_; 339 base::Lock lock_;
340 340
341 friend struct base::DefaultLazyInstanceTraits<PluginList>; 341 friend struct base::DefaultLazyInstanceTraits<PluginList>;
342 342
343 DISALLOW_COPY_AND_ASSIGN(PluginList); 343 DISALLOW_COPY_AND_ASSIGN(PluginList);
344 }; 344 };
345 345
346 } // namespace npapi 346 } // namespace npapi
347 } // namespace webkit 347 } // namespace webkit
348 348
349 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_ 349 #endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIST_H_
OLDNEW
« no previous file with comments | « webkit/glue/webmediaplayer_impl.cc ('k') | webkit/plugins/npapi/plugin_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698