drive: Pass through AboutResouce from server among callbacks in ChangeListLoader.

chrome/browser/chromeos/drive/change_list_loader.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_
 #define CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_
 
 #include <queue>
 #include <string>
 #include <utility>
@@ skipping 96 matching lines @@
   // See the comment at Load() for |directory_fetch_info| parameter.
   // |callback| must not be null.
   // TODO(satorux): make this private. crbug.com/193417
   void LoadFromServerIfNeeded(const DirectoryFetchInfo& directory_fetch_info,
                               const FileOperationCallback& callback);
 
   // Updates whole directory structure feeds collected in |feed_list|.
   // Record file statistics as UMA histograms.
   //
   // See comments at ChangeListProcessor::ApplyFeeds() for
-  // |is_delta_feed| and |root_feed_changestamp|.
+  // |about_resource| and |is_delta_feed|.
   // |update_finished_callback| must not be null.
-  void UpdateFromFeed(const ScopedVector<google_apis::ResourceList>& feed_list,
-                      bool is_delta_feed,
-                      int64 root_feed_changestamp,
-                      const base::Closure& update_finished_callback);
+  void UpdateFromFeed(
+      scoped_ptr<google_apis::AboutResource> about_resource,
+      const ScopedVector<google_apis::ResourceList>& feed_list,
+      bool is_delta_feed,
+      const base::Closure& update_finished_callback);
 
   // Schedules |callback| to run when it's ready (i.e. the change list
   // loading is complete or the directory specified by |directory_fetch_info|
   // is loaded). |directory_fetch_info| can be empty if the callback is not
   // interested in a particular directory.
   // |callback| must not be null.
   void ScheduleRun(const DirectoryFetchInfo& directory_fetch_info,
                    const FileOperationCallback& callback);
 
   // Indicates whether there is a feed refreshing server request is in flight.
@@ skipping 61 matching lines @@
   // Part of LoadFromServerIfNeeded() Callled when
   // DriveScheduler::GetAboutResource() is complete. This method calls
   // CompareChangestampsAndLoadIfNeeded() to make a decision about whether or
   // not to fetch the change list.
   void LoadFromServerIfNeededAfterGetAbout(
       const DirectoryFetchInfo& directory_fetch_info,
       const FileOperationCallback& callback,
       google_apis::GDataErrorCode status,
       scoped_ptr<google_apis::AboutResource> about_resource);
 
-  // Compares |remote_changestamp| and |local_changestamp| and triggers
+  // Compares the largetst_change_id in |about_resource| and |local_changestamp|
+  // and triggers
   // LoadFromServer if necessary.
   void CompareChangestampsAndLoadIfNeeded(
       const DirectoryFetchInfo& directory_fetch_info,
       const FileOperationCallback& callback,
-      int64 remote_changestamp,
+      scoped_ptr<google_apis::AboutResource> about_resource,
       int64 local_changestamp);
 
   // Starts loading the change list since |start_changestamp|, or the full
-  // resource list if |start_changestamp| is zero. |remote_changestamp| will
-  // be stored in DriveResourceMetadata, once loading is done.
-  // callback must not be null.
+  // resource list if |start_changestamp| is zero. For full update, the
+  // largest_change_id and root_folder_id from |about_resource| will be used.
+  // |callback| must not be null.
   void LoadChangeListFromServer(
+      scoped_ptr<google_apis::AboutResource> about_resource,
       int64 start_changestamp,
-      int64 remote_changestamp,
       const FileOperationCallback& callback);
 
   // Callback for handling response from |DriveAPIService::GetAppList|.
   // If the application list is successfully parsed, passes the list to
   // Drive webapps registry.
   void OnGetAppList(google_apis::GDataErrorCode status,
                     scoped_ptr<google_apis::AppList> app_list);
 
   // Callback for handling feed content fetching while searching for file info.
   // This callback is invoked after async feed fetch operation that was
   // invoked by StartDirectoryRefresh() completes. This callback will update
   // the content of the refreshed directory object and continue initially
   // started FindEntryByPath() request.
   void UpdateMetadataFromFeedAfterLoadFromServer(
+      scoped_ptr<google_apis::AboutResource> about_resource,
       bool is_delta_feed,
-      int64 feed_changestamp,
       const FileOperationCallback& callback,
       const ScopedVector<google_apis::ResourceList>& feed_list,
       DriveFileError error);
 
   // Save filesystem to disk.
   void SaveFileSystem();
 
   // Callback for handling UI updates caused by feed fetching.
   void OnNotifyResourceListFetched(
       base::WeakPtr<GetResourceListUiState> ui_state);
@@ skipping 21 matching lines @@
   scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
   ObserverList<ChangeListLoaderObserver> observers_;
   scoped_ptr<ChangeListProcessor> change_list_processor_;
   typedef std::pair<DirectoryFetchInfo,
                     FileOperationCallback> QueuedCallbackInfo;
   std::queue<QueuedCallbackInfo> queue_;
 
   // Indicates whether there is a feed refreshing server request is in flight.
   bool refreshing_;
 
+  // Resource ID for the user's "My Drive" root. This must be retrieved from

[hidehiko, 2013/03/18 06:22:27]

Don't need?

[Haruki Sato, 2013/03/18 07:06:41]

Done. Thanks.

+  // the server.
+  // std::string drive_root_resource_id_;
+
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ChangeListLoader> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(ChangeListLoader);
 };
 
 }  // namespace drive
 
 #endif  // CHROME_BROWSER_CHROMEOS_DRIVE_CHANGE_LIST_LOADER_H_