Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6806)

Unified Diff: chrome/browser/sync_file_system/drive_backend/metadata_database.cc

Issue 384543004: Get rid of DriveEntryKind. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed some temporary variables and IsHostedDocumentByFileExtension(). Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync_file_system/drive_backend/metadata_database.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
index b31f2ab9f6ed072c015aa59ff26cb5e72d7fed0d..0cf49edb2ae44ae08d3640d0a801c4b29f40fe37 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_database.cc
@@ -31,7 +31,6 @@
#include "chrome/browser/sync_file_system/logger.h"
#include "chrome/browser/sync_file_system/syncable_file_system_util.h"
#include "google_apis/drive/drive_api_parser.h"
-#include "google_apis/drive/drive_entry_kinds.h"
#include "third_party/leveldatabase/src/include/leveldb/db.h"
#include "third_party/leveldatabase/src/include/leveldb/env.h"
#include "third_party/leveldatabase/src/include/leveldb/status.h"
@@ -93,13 +92,12 @@ void PopulateFileDetailsByFileResource(
}
details->set_title(file_resource.title());
- google_apis::DriveEntryKind kind = drive::util::GetKind(file_resource);
- if (kind == google_apis::ENTRY_KIND_FILE)
- details->set_file_kind(FILE_KIND_FILE);
- else if (kind == google_apis::ENTRY_KIND_FOLDER)
+ if (file_resource.IsDirectory())
details->set_file_kind(FILE_KIND_FOLDER);
- else
+ else if (drive::util::IsHostedDocument(file_resource.mime_type()))
details->set_file_kind(FILE_KIND_UNSUPPORTED);
+ else
+ details->set_file_kind(FILE_KIND_FILE);
details->set_md5(file_resource.md5_checksum());
details->set_etag(file_resource.etag());

Powered by Google App Engine
This is Rietveld 408576698