Chromium Code Reviews| Index: chrome/browser/chromeos/drive/change_list_processor.cc |
| diff --git a/chrome/browser/chromeos/drive/change_list_processor.cc b/chrome/browser/chromeos/drive/change_list_processor.cc |
| index 5f38ce4655ecaf0c6e6478735905b26944f632de..f39d269f13c41f28c58380ad52e653ca5220c694 100644 |
| --- a/chrome/browser/chromeos/drive/change_list_processor.cc |
| +++ b/chrome/browser/chromeos/drive/change_list_processor.cc |
| @@ -8,6 +8,7 @@ |
| #include "base/metrics/histogram.h" |
| #include "chrome/browser/chromeos/drive/drive.pb.h" |
| +#include "chrome/browser/chromeos/drive/drive_file_system_util.h" |
| #include "chrome/browser/chromeos/drive/drive_resource_metadata.h" |
| #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" |
| #include "chrome/browser/google_apis/gdata_wapi_parser.h" |
| @@ -59,10 +60,13 @@ class ChangeListProcessor::ChangeListToEntryProtoMapUMAStats { |
| }; |
| ChangeListProcessor::ChangeListProcessor( |
| - DriveResourceMetadata* resource_metadata) |
| + DriveResourceMetadata* resource_metadata, |
| + const std::string drive_root_resource_id) |
|
hidehiko
2013/03/15 06:57:44
Let's make this an argument of ApplyFeeds().
I thi
Haruki Sato
2013/03/18 04:20:25
Done. Thank you for the advice!
|
| : resource_metadata_(resource_metadata), |
| + drive_root_resource_id_(drive_root_resource_id), |
| largest_changestamp_(0), |
| ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) { |
| + DCHECK(!drive_root_resource_id_.empty()); |
| } |
| ChangeListProcessor::~ChangeListProcessor() { |
| @@ -78,11 +82,15 @@ void ChangeListProcessor::ApplyFeeds( |
| int64 delta_feed_changestamp = 0; |
| ChangeListToEntryProtoMapUMAStats uma_stats; |
| + |
| FeedToEntryProtoMap(feed_list, &delta_feed_changestamp, &uma_stats); |
| // Note FeedToEntryProtoMap calls Clear() which resets on_complete_callback_. |
| on_complete_callback_ = on_complete_callback; |
| largest_changestamp_ = |
| is_delta_feed ? delta_feed_changestamp : root_feed_changestamp; |
| + |
| + // TODO(haruki): Add psuedo tree structure fo "drive"/root" and |
| + // "drive/other" when we start using those namespaces. |
| ApplyEntryProtoMap(is_delta_feed); |
| // Shouldn't record histograms when processing delta feeds. |