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

Unified Diff: trunk/src/base/files/file_path_watcher_mac.cc

Issue 316853003: Revert 274735 "Use FSEvents for recursive file watch on Mac" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | « trunk/src/base/files/file_path_watcher_linux.cc ('k') | trunk/src/base/files/file_path_watcher_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/base/files/file_path_watcher_mac.cc
===================================================================
--- trunk/src/base/files/file_path_watcher_mac.cc (revision 274756)
+++ trunk/src/base/files/file_path_watcher_mac.cc (working copy)
@@ -1,64 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "base/files/file_path_watcher.h"
-#include "base/files/file_path_watcher_kqueue.h"
-
-#if !defined(OS_IOS)
-#include "base/files/file_path_watcher_fsevents.h"
-#include "base/mac/mac_util.h"
-#endif
-
-namespace base {
-
-namespace {
-
-class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
- public:
- virtual bool Watch(const FilePath& path,
- bool recursive,
- const FilePathWatcher::Callback& callback) OVERRIDE {
- // Use kqueue for non-recursive watches and FSEvents for recursive ones.
- DCHECK(!impl_.get());
- if (recursive) {
- // FSEvents isn't available on iOS and is broken on OSX 10.6 and earlier.
- // See http://crbug.com/54822#c31
-#if !defined(OS_IOS)
- if (mac::IsOSLionOrLater())
- impl_ = new FilePathWatcherFSEvents();
-#endif // OS_IOS
-
- if (!impl_)
- return false;
- } else {
- impl_ = new FilePathWatcherKQueue();
- }
- return impl_->Watch(path, recursive, callback);
- }
-
- virtual void Cancel() OVERRIDE {
- if (impl_)
- impl_->Cancel();
- set_cancelled();
- }
-
- virtual void CancelOnMessageLoopThread() OVERRIDE {
- if (impl_)
- impl_->Cancel();
- set_cancelled();
- }
-
- protected:
- virtual ~FilePathWatcherImpl() {}
-
- scoped_refptr<PlatformDelegate> impl_;
-};
-
-} // namespace
-
-FilePathWatcher::FilePathWatcher() {
- impl_ = new FilePathWatcherImpl();
-}
-
-} // namespace base
« no previous file with comments | « trunk/src/base/files/file_path_watcher_linux.cc ('k') | trunk/src/base/files/file_path_watcher_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698