chrome/browser/chromeos/file_system_provider/registry.cc - Issue 679573002: [fsp] Separate recursive and non-recursive watchers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/file_system_provider/registry.cc

Issue 679573002: [fsp] Separate recursive and non-recursive watchers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed. Created 6 years, 2 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 | « chrome/browser/chromeos/file_system_provider/provided_file_system_unittest.cc ('k') | chrome/browser/chromeos/file_system_provider/registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/file_system_provider/registry.cc

diff --git a/chrome/browser/chromeos/file_system_provider/registry.cc b/chrome/browser/chromeos/file_system_provider/registry.cc

index d5c9e28fa7eb7cb8bef3e35d1318df96b178ec60..58fc872f1478f4abb97a3c9770f6c80bedb17b81 100644

--- a/chrome/browser/chromeos/file_system_provider/registry.cc

+++ b/chrome/browser/chromeos/file_system_provider/registry.cc

@@ -64,8 +64,8 @@ void Registry::RememberFileSystem(

for (const auto& it : observed_entries) {

base::DictionaryValue* const observed_entry = new base::DictionaryValue();

- observed_entries_value->SetWithoutPathExpansion(it.first.value(),

- observed_entry);

+ observed_entries_value->SetWithoutPathExpansion(

+ it.second.entry_path.value(), observed_entry);

observed_entry->SetStringWithoutPathExpansion(

kPrefKeyObservedEntryEntryPath, it.second.entry_path.value());

observed_entry->SetBooleanWithoutPathExpansion(

@@ -201,8 +201,8 @@ scoped_ptr<Registry::RestoredFileSystems> Registry::RestoreFileSystems(

base::FilePath::FromUTF8Unsafe(entry_path);

restored_observed_entry.recursive = recursive;

restored_observed_entry.last_tag = last_tag;

- restored_file_system

- .observed_entries[base::FilePath::FromUTF8Unsafe(entry_path)] =

+ restored_file_system.observed_entries[ObservedEntryKey(

+ base::FilePath::FromUTF8Unsafe(entry_path), recursive)] =

restored_observed_entry;

}