| Index: chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc
|
| diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc b/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc
|
| index 8c7828e167043a609408d23ea84f1d4730eed8f9..776b07e989cd9cf63ee6d474acbbee9adbe38989 100644
|
| --- a/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc
|
| +++ b/chrome/browser/chromeos/gdata/gdata_wapi_feed_loader.cc
|
| @@ -254,6 +254,12 @@ void GDataWapiFeedLoader::ReloadFromServerIfNeeded(
|
| local_changestamp,
|
| search_file_path,
|
| callback));
|
| + // Drive v2 needs a separate application list fetch operation.
|
| + // TODO(kochi): Application list rarely changes and do not necessarily
|
| + // refresed as often as files.
|
| + documents_service_->GetApplicationList(
|
| + base::Bind(&GDataWapiFeedLoader::OnGetApplicationList,
|
| + weak_ptr_factory_.GetWeakPtr()));
|
| return;
|
| }
|
|
|
| @@ -321,7 +327,7 @@ void GDataWapiFeedLoader::OnGetAccountMetadata(
|
| return;
|
| }
|
|
|
| - webapps_registry_->UpdateFromFeed(account_metadata.get());
|
| + webapps_registry_->UpdateFromFeed(*account_metadata.get());
|
|
|
| bool changes_detected = true;
|
| if (local_changestamp >= account_metadata->largest_changestamp()) {
|
| @@ -445,6 +451,24 @@ void GDataWapiFeedLoader::OnGetAboutResource(
|
| weak_ptr_factory_.GetWeakPtr()));
|
| }
|
|
|
| +void GDataWapiFeedLoader::OnGetApplicationList(
|
| + GDataErrorCode status,
|
| + scoped_ptr<base::Value> json) {
|
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| +
|
| + GDataFileError error = util::GDataToGDataFileError(status);
|
| + if (error != GDATA_FILE_OK)
|
| + return;
|
| +
|
| + if (json.get()) {
|
| + scoped_ptr<AppList> applist(AppList::CreateFrom(*json));
|
| + if (applist.get()) {
|
| + VLOG(1) << "applist get success";
|
| + webapps_registry_->UpdateFromApplicationList(*applist.get());
|
| + }
|
| + }
|
| +}
|
| +
|
| // TODO(kochi): Fix too many parameters. http://crbug.com/141359
|
| void GDataWapiFeedLoader::LoadFromServer(
|
| ContentOrigin initial_origin,
|
|
|