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

Unified Diff: chrome/browser/google_apis/gdata_wapi_parser.h

Issue 10920091: Move Drive API files to google_apis directory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable some tests Created 8 years, 3 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/google_apis/gdata_wapi_parser.h
diff --git a/chrome/browser/chromeos/gdata/gdata_wapi_parser.h b/chrome/browser/google_apis/gdata_wapi_parser.h
similarity index 97%
rename from chrome/browser/chromeos/gdata/gdata_wapi_parser.h
rename to chrome/browser/google_apis/gdata_wapi_parser.h
index 25f85d0c99b01ddefba5be83f5eb1c4bd54a60c3..98363fac86c95633737ff1416e50eed0ce0c648e 100644
--- a/chrome/browser/chromeos/gdata/gdata_wapi_parser.h
+++ b/chrome/browser/google_apis/gdata_wapi_parser.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_PARSER_H_
-#define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_PARSER_H_
+#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_PARSER_H_
+#define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_PARSER_H_
#include <string>
#include <utility>
@@ -14,7 +14,7 @@
#include "base/memory/scoped_vector.h"
#include "base/string_piece.h"
#include "base/time.h"
-#include "chrome/browser/chromeos/gdata/drive_entry_kinds.h"
+#include "chrome/browser/google_apis/drive_entry_kinds.h"
#include "googleurl/src/gurl.h"
class FilePath;
@@ -438,20 +438,24 @@ class DocumentEntry : public FeedEntry {
// True if document entry is remotely hosted.
bool is_hosted_document() const {
- return ClassifyEntryKind(kind_) & KIND_OF_HOSTED_DOCUMENT;
+ return (ClassifyEntryKind(kind_) & KIND_OF_HOSTED_DOCUMENT) > 0;
}
// True if document entry hosted by Google Documents.
bool is_google_document() const {
- return ClassifyEntryKind(kind_) & KIND_OF_GOOGLE_DOCUMENT;
+ return (ClassifyEntryKind(kind_) & KIND_OF_GOOGLE_DOCUMENT) > 0;
}
// True if document entry is hosted by an external application.
bool is_external_document() const {
- return ClassifyEntryKind(kind_) & KIND_OF_EXTERNAL_DOCUMENT;
+ return (ClassifyEntryKind(kind_) & KIND_OF_EXTERNAL_DOCUMENT) > 0;
}
// True if document entry is a folder (collection).
- bool is_folder() const { return ClassifyEntryKind(kind_) & KIND_OF_FOLDER; }
+ bool is_folder() const {
+ return (ClassifyEntryKind(kind_) & KIND_OF_FOLDER) > 0;
+ }
// True if document entry is regular file.
- bool is_file() const { return ClassifyEntryKind(kind_) & KIND_OF_FILE; }
+ bool is_file() const {
+ return (ClassifyEntryKind(kind_) & KIND_OF_FILE) > 0;
+ }
// True if document entry can't be mapped to the file system.
bool is_special() const {
return !is_file() && !is_folder() && !is_hosted_document();
@@ -721,4 +725,4 @@ class AccountMetadataFeed {
} // namespace gdata
-#endif // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_WAPI_PARSER_H_
+#endif // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_PARSER_H_

Powered by Google App Engine
This is Rietveld 408576698