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

Unified Diff: chrome/browser/devtools/devtools_file_helper.cc

Issue 1422463007: DevTools: use inotify to pick changes on the filesystem. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: build fix Created 5 years, 1 month 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 | « chrome/browser/devtools/devtools_file_helper.h ('k') | chrome/browser/devtools/devtools_file_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/devtools/devtools_file_helper.cc
diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc
index 361d7396593f474e39f8fe954255f14122bc4a32..d3a9312baaf6ed65b1b2fbe9533ffdbf5efb6a0e 100644
--- a/chrome/browser/devtools/devtools_file_helper.cc
+++ b/chrome/browser/devtools/devtools_file_helper.cc
@@ -17,6 +17,7 @@
#include "base/strings/utf_string_conversions.h"
#include "base/value_conversions.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/devtools/devtools_file_watcher.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/profiles/profile.h"
@@ -212,9 +213,14 @@ DevToolsFileHelper::DevToolsFileHelper(WebContents* web_contents,
pref_change_registrar_.Add(prefs::kDevToolsFileSystemPaths,
base::Bind(&DevToolsFileHelper::FileSystemPathsSettingChanged,
base::Unretained(this)));
+ file_watcher_.reset(new DevToolsFileWatcher(
+ base::Bind(&DevToolsFileHelper::FilePathsChanged,
+ weak_factory_.GetWeakPtr())));
}
DevToolsFileHelper::~DevToolsFileHelper() {
+ BrowserThread::DeleteSoon(BrowserThread::FILE, FROM_HERE,
+ file_watcher_.release());
}
void DevToolsFileHelper::Save(const std::string& url,
@@ -392,6 +398,9 @@ DevToolsFileHelper::GetFileSystems() {
file_system_id,
file_system_path);
file_systems.push_back(filesystem);
+ BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+ Bind(&DevToolsFileWatcher::AddWatch,
+ base::Unretained(file_watcher_.get()), path));
}
return file_systems;
}
@@ -426,12 +435,26 @@ void DevToolsFileHelper::FileSystemPathsSettingChanged() {
file_system_id,
file_system_path);
delegate_->FileSystemAdded(filesystem);
+ BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+ Bind(&DevToolsFileWatcher::AddWatch,
+ base::Unretained(file_watcher_.get()),
+ path));
} else {
remaining.erase(file_system_path);
}
file_system_paths_.insert(file_system_path);
}
- for (auto file_system_path : remaining)
+ for (auto file_system_path : remaining) {
delegate_->FileSystemRemoved(file_system_path);
+ base::FilePath path = base::FilePath::FromUTF8Unsafe(file_system_path);
+ BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
+ Bind(&DevToolsFileWatcher::RemoveWatch,
+ base::Unretained(file_watcher_.get()), path));
+ }
+}
+
+void DevToolsFileHelper::FilePathsChanged(
+ const std::vector<std::string>& paths) {
+ delegate_->FilePathsChanged(paths);
}
« no previous file with comments | « chrome/browser/devtools/devtools_file_helper.h ('k') | chrome/browser/devtools/devtools_file_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698