| Index: chrome/browser/chromeos/gdata/gdata_file_system.h
|
| diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.h b/chrome/browser/chromeos/gdata/gdata_file_system.h
|
| index 5be09c7895ec1772779cf7355456a5e0a6cf5753..df432ddd1e05d4ae96b0971447920cd9513b5f29 100644
|
| --- a/chrome/browser/chromeos/gdata/gdata_file_system.h
|
| +++ b/chrome/browser/chromeos/gdata/gdata_file_system.h
|
| @@ -62,6 +62,7 @@ class GDataFileSystem : public GDataFileSystemInterface,
|
| const std::string& resource_id,
|
| const GetFileInfoWithFilePathCallback& callback) OVERRIDE;
|
| virtual void Search(const std::string& search_query,
|
| + const GURL& next_feed,
|
| const SearchCallback& callback) OVERRIDE;
|
| virtual void TransferFileFromRemoteToLocal(
|
| const FilePath& remote_src_file_path,
|
| @@ -591,12 +592,14 @@ class GDataFileSystem : public GDataFileSystemInterface,
|
| // after we retrieve first feed chunk.
|
| // If invoked as a part of content search, query will be set in
|
| // |search_query|.
|
| + // If |feed_to_load| is set, this is feed url that will be used to load feed.
|
| void LoadFeedFromServer(ContentOrigin initial_origin,
|
| int start_changestamp,
|
| int root_feed_changestamp,
|
| bool should_fetch_multiple_feeds,
|
| const FilePath& search_file_path,
|
| const std::string& search_query,
|
| + const GURL& feed_to_load,
|
| const std::string& directory_resource_id,
|
| const FindEntryCallback& entry_found_callback,
|
| const LoadDocumentFeedCallback& load_feed_callback);
|
| @@ -754,6 +757,7 @@ class GDataFileSystem : public GDataFileSystemInterface,
|
| // The following functions are used to forward calls to asynchronous public
|
| // member functions to UI thread.
|
| void SearchAsyncOnUIThread(const std::string& search_query,
|
| + const GURL& next_feed,
|
| const SearchCallback& callback);
|
| void OpenFileOnUIThread(const FilePath& file_path,
|
| const OpenFileCallback& callback);
|
|
|