summaryrefslogtreecommitdiffstats
path: root/base/files
diff options
context:
space:
mode:
authorjingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 04:43:54 +0000
committerjingzhao@chromium.org <jingzhao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-29 04:43:54 +0000
commit4d0f93ca8cec419891f009d476f1525ccab56e54 (patch)
treee1d948f4ef60216d351aef78aa259ba6ba8767e3 /base/files
parent86e99b8b7da2a57d0cd8f238d7801a12dcdaee58 (diff)
downloadchromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.zip
chromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.tar.gz
chromium_src-4d0f93ca8cec419891f009d476f1525ccab56e54.tar.bz2
Upstream ProcessUtilTest, and make a few other files compile on Android.
BUG= TEST= Review URL: http://codereview.chromium.org/8059007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/files')
-rw-r--r--base/files/file_path_watcher_stub.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/base/files/file_path_watcher_stub.cc b/base/files/file_path_watcher_stub.cc
index a693dc7..6c49101 100644
--- a/base/files/file_path_watcher_stub.cc
+++ b/base/files/file_path_watcher_stub.cc
@@ -15,10 +15,13 @@ namespace {
class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
public:
virtual bool Watch(const FilePath& path,
- FileWatcher::Delegate* delegate,
- base::MessageLoopProxy*) OVERRIDE {
+ FilePathWatcher::Delegate* delegate) OVERRIDE {
return false;
}
+
+ virtual void Cancel() OVERRIDE {}
+
+ virtual void CancelOnMessageLoopThread() OVERRIDE {}
};
} // namespace