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

Unified Diff: content/browser/plugin_service.cc

Issue 6793020: Move FilePathWatcher to base/files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: use ::operator<< Created 9 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/plugin_service.h ('k') | content/common/file_path_watcher/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_service.cc
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc
index 409bd67ed0c009cae3aa4d4dd3e6aceb112ccc7d..97e73ebeb72348baa2e595b9f343b9640077a1e6 100644
--- a/content/browser/plugin_service.cc
+++ b/content/browser/plugin_service.cc
@@ -38,6 +38,10 @@
#include "chrome/browser/chromeos/plugin_selection_policy.h"
#endif
+#if defined(OS_LINUX)
+using ::base::files::FilePathWatcher;
+#endif
+
#if defined(OS_MACOSX)
static void NotifyPluginsOfActivation() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ -147,7 +151,6 @@ PluginService::PluginService()
&plugin_dirs);
for (size_t i = 0; i < plugin_dirs.size(); ++i) {
- FilePathWatcher* watcher = new FilePathWatcher();
// FilePathWatcher can not handle non-absolute paths under windows.
// We don't watch for file changes in windows now but if this should ever
// be extended to Windows these lines might save some time of debugging.
@@ -155,6 +158,7 @@ PluginService::PluginService()
if (!plugin_dirs[i].IsAbsolute())
continue;
#endif
+ FilePathWatcher* watcher = new FilePathWatcher();
VLOG(1) << "Watching for changes in: " << plugin_dirs[i].value();
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
« no previous file with comments | « content/browser/plugin_service.h ('k') | content/common/file_path_watcher/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698