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

Side by Side Diff: content/browser/plugin_service.h

Issue 6670081: Move FilePathWatcher class from browser/... to common/... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 9 years, 9 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // This class responds to requests from renderers for the list of plugins, and 5 // This class responds to requests from renderers for the list of plugins, and
6 // also a proxy object for plugin instances. 6 // also a proxy object for plugin instances.
7 7
8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_ 8 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_H_
9 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_ 9 #define CONTENT_BROWSER_PLUGIN_SERVICE_H_
10 #pragma once 10 #pragma once
(...skipping 15 matching lines...) Expand all
26 #include "googleurl/src/gurl.h" 26 #include "googleurl/src/gurl.h"
27 #include "ipc/ipc_channel_handle.h" 27 #include "ipc/ipc_channel_handle.h"
28 #include "webkit/plugins/npapi/webplugininfo.h" 28 #include "webkit/plugins/npapi/webplugininfo.h"
29 29
30 #if defined(OS_WIN) 30 #if defined(OS_WIN)
31 #include "base/scoped_ptr.h" 31 #include "base/scoped_ptr.h"
32 #include "base/win/registry.h" 32 #include "base/win/registry.h"
33 #endif 33 #endif
34 34
35 #if defined(OS_LINUX) 35 #if defined(OS_LINUX)
36 #include "chrome/browser/file_path_watcher/file_path_watcher.h" 36 #include "content/common/file_path_watcher/file_path_watcher.h"
37 #endif 37 #endif
38 38
39 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
40 namespace chromeos { 40 namespace chromeos {
41 class PluginSelectionPolicy; 41 class PluginSelectionPolicy;
42 } 42 }
43 #endif 43 #endif
44 44
45 namespace IPC { 45 namespace IPC {
46 class Message; 46 class Message;
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 206
207 std::vector<OverriddenPlugin> overridden_plugins_; 207 std::vector<OverriddenPlugin> overridden_plugins_;
208 base::Lock overridden_plugins_lock_; 208 base::Lock overridden_plugins_lock_;
209 209
210 DISALLOW_COPY_AND_ASSIGN(PluginService); 210 DISALLOW_COPY_AND_ASSIGN(PluginService);
211 }; 211 };
212 212
213 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService); 213 DISABLE_RUNNABLE_METHOD_REFCOUNT(PluginService);
214 214
215 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_H_ 215 #endif // CONTENT_BROWSER_PLUGIN_SERVICE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698