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

Unified Diff: content/common/file_path_watcher/file_path_watcher_win.cc

Issue 6731064: kqueue implementation of FilePathWatcher on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Xcode didn't save some files, so win and linux changes missed 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 side-by-side diff with in-line comments
Download patch
Index: content/common/file_path_watcher/file_path_watcher_win.cc
diff --git a/content/common/file_path_watcher/file_path_watcher_win.cc b/content/common/file_path_watcher/file_path_watcher_win.cc
index 448e857cadc0b5ed7d17564ab9aaf755f587007b..bf24e18ce3e47d0e3c8a837142f26168295ac4e8 100644
--- a/content/common/file_path_watcher/file_path_watcher_win.cc
+++ b/content/common/file_path_watcher/file_path_watcher_win.cc
@@ -22,8 +22,7 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
// FilePathWatcher::PlatformDelegate overrides.
virtual bool Watch(const FilePath& path,
- FilePathWatcher::Delegate* delegate,
- base::MessageLoopProxy* loop) OVERRIDE;
+ FilePathWatcher::Delegate* delegate) OVERRIDE;
virtual void Cancel() OVERRIDE;
// Deletion of the FilePathWatcher will call Cancel() to dispose of this
@@ -76,8 +75,7 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
};
bool FilePathWatcherImpl::Watch(const FilePath& path,
- FilePathWatcher::Delegate* delegate,
- base::MessageLoopProxy*) {
+ FilePathWatcher::Delegate* delegate) {
DCHECK(target_.value().empty()); // Can only watch one path.
set_message_loop(base::MessageLoopProxy::CreateForCurrentThread());
@@ -131,7 +129,7 @@ void FilePathWatcherImpl::OnObjectSignaled(HANDLE object) {
scoped_refptr<FilePathWatcherImpl> keep_alive(this);
if (!UpdateWatch()) {
- delegate_->OnError();
+ delegate_->OnFilePathError(target_);
return;
}

Powered by Google App Engine
This is Rietveld 408576698