OLD | NEW |
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 #include "content/browser/plugin_service.h" | 5 #include "content/browser/plugin_service.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
542 webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info); | 542 webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(info); |
543 } | 543 } |
544 } | 544 } |
545 | 545 |
546 #if defined(OS_LINUX) | 546 #if defined(OS_LINUX) |
547 // static | 547 // static |
548 void PluginService::RegisterFilePathWatcher( | 548 void PluginService::RegisterFilePathWatcher( |
549 FilePathWatcher *watcher, | 549 FilePathWatcher *watcher, |
550 const FilePath& path, | 550 const FilePath& path, |
551 FilePathWatcher::Delegate* delegate) { | 551 FilePathWatcher::Delegate* delegate) { |
552 bool result = watcher->Watch(path, delegate); | 552 bool result = watcher->Watch( |
| 553 path, delegate, base::MessageLoopProxy::CreateForCurrentThread()); |
553 DCHECK(result); | 554 DCHECK(result); |
554 } | 555 } |
555 #endif | 556 #endif |
OLD | NEW |