WIP.

components/drive/chromeos/directory_loader.cc

 // 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 "components/drive/chromeos/directory_loader.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 82 matching lines @@
   ReadDirectoryEntriesCallback entries_callback;
   FileOperationCallback completion_callback;
   std::set<std::string> sent_entry_names;
 };
 
 // Fetches the resource entries in the directory with |directory_resource_id|.
 class DirectoryLoader::FeedFetcher {
  public:
   FeedFetcher(DirectoryLoader* loader,
               const DirectoryFetchInfo& directory_fetch_info,
-              const std::string& root_folder_id)
+              const std::string& root_folder_id,
+              const std::string& team_drive_id)
       : loader_(loader),
         directory_fetch_info_(directory_fetch_info),
         root_folder_id_(root_folder_id),
-        weak_ptr_factory_(this) {
-  }
+        team_drive_id_(team_drive_id),
+        weak_ptr_factory_(this) {}
 
   ~FeedFetcher() {
   }
 
   void Run(const FileOperationCallback& callback) {
     DCHECK(thread_checker_.CalledOnValidThread());
     DCHECK(!callback.is_null());
     DCHECK(!directory_fetch_info_.resource_id().empty());
 
     // Remember the time stamp for usage stats.
     start_time_ = base::TimeTicks::Now();
 
     loader_->scheduler_->GetFileListInDirectory(
-        directory_fetch_info_.resource_id(),
+        directory_fetch_info_.resource_id(), team_drive_id_,
         base::Bind(&FeedFetcher::OnFileListFetched,
                    weak_ptr_factory_.GetWeakPtr(), callback));
   }
 
  private:
   void OnFileListFetched(const FileOperationCallback& callback,
                          google_apis::DriveApiErrorCode status,
                          std::unique_ptr<google_apis::FileList> file_list) {
     DCHECK(thread_checker_.CalledOnValidThread());
     DCHECK(!callback.is_null());
@@ skipping 49 matching lines @@
 
     // Note: The fetcher is managed by DirectoryLoader, and the instance
     // will be deleted in the callback. Do not touch the fields after this
     // invocation.
     callback.Run(FILE_ERROR_OK);
   }
 
   DirectoryLoader* loader_;
   DirectoryFetchInfo directory_fetch_info_;
   std::string root_folder_id_;
+  std::string team_drive_id_;
   base::TimeTicks start_time_;
   base::ThreadChecker thread_checker_;
   base::WeakPtrFactory<FeedFetcher> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(FeedFetcher);
 };
 
 DirectoryLoader::DirectoryLoader(
     EventLogger* logger,
     base::SequencedTaskRunner* blocking_task_runner,
     ResourceMetadata* resource_metadata,
@@ skipping 292 matching lines @@
   const google_apis::AboutResource* about_resource =
       about_resource_loader_->cached_about_resource();
   DCHECK(about_resource);
 
   logger_->Log(logging::LOG_INFO,
                "Fast-fetch start: %s; Server changestamp: %s",
                directory_fetch_info.ToString().c_str(),
                base::Int64ToString(
                    about_resource->largest_change_id()).c_str());
 
-  FeedFetcher* fetcher = new FeedFetcher(this,
-                                         directory_fetch_info,
-                                         about_resource->root_folder_id());
+  // TODO(yamaguchi): Pass the right |team_drive_id| based on
+  // directory_fetch_info. Curently it doesn't support fetching a directory
+  // under Team Drives.
+  FeedFetcher* fetcher =
+      new FeedFetcher(this, directory_fetch_info,
+                      about_resource->root_folder_id(), "" /* team_drive_id */);
   fast_fetch_feed_fetcher_set_.insert(base::WrapUnique(fetcher));
   fetcher->Run(
       base::Bind(&DirectoryLoader::LoadDirectoryFromServerAfterLoad,
                  weak_ptr_factory_.GetWeakPtr(),
                  directory_fetch_info,
                  fetcher));
 }
 
 void DirectoryLoader::LoadDirectoryFromServerAfterLoad(
     const DirectoryFetchInfo& directory_fetch_info,
@@ skipping 50 matching lines @@
 
   // Also notify the observers.
   if (error == FILE_ERROR_OK && !directory_path->empty()) {
     for (auto& observer : observers_)
       observer.OnDirectoryReloaded(*directory_path);
   }
 }
 
 }  // namespace internal
 }  // namespace drive