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

Unified Diff: chrome/browser/chromeos/gdata/gdata_parser.cc

Issue 10546034: Adds parsing for the app_id field from an "open-with-" link (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added json test Created 8 years, 6 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/chromeos/gdata/gdata_parser.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_parser.cc b/chrome/browser/chromeos/gdata/gdata_parser.cc
index f0c430f3fe3726ecb5d78c63dd53d086b0e455a0..f80e49ab337c945abc5f78987884c7ad6cb14f1e 100644
--- a/chrome/browser/chromeos/gdata/gdata_parser.cc
+++ b/chrome/browser/chromeos/gdata/gdata_parser.cc
@@ -124,6 +124,10 @@ const char kTermAttr[] = "term";
const char kTypeAttr[] = "type";
const char kValueAttr[] = "value";
+// Link Prefixes
+const char kOpenWithPrefix[] = "http://schemas.google.com/docs/2007#open-with-";
+const size_t kOpenWithPrefixSize = arraysize(kOpenWithPrefix) - 1;
+
struct EntryKindMap {
DocumentEntry::EntryKind kind;
const char* entry;
@@ -276,25 +280,61 @@ Author* Author::CreateFromXml(XmlReader* xml_reader) {
Link::Link() : type_(Link::UNKNOWN) {
}
+// static
+bool Link::GetAppID(const base::StringPiece& rel, std::string* app_id) {
+ DCHECK(app_id);
+ // Fast return path if the link clearly isn't an OPEN_WITH link.
+ if (rel.size() < kOpenWithPrefixSize) {
+ app_id->clear();
+ return true;
+ }
+
+ const std::string kOpenWithPrefixStr(kOpenWithPrefix);
+ if (StartsWithASCII(rel.as_string(), kOpenWithPrefixStr, false)) {
+ *app_id = rel.as_string().substr(kOpenWithPrefixStr.size());
+ return true;
+ }
+
+ app_id->clear();
+ return true;
+}
+
// static.
-bool Link::GetLinkType(const base::StringPiece& rel, Link::LinkType* result) {
+bool Link::GetLinkType(const base::StringPiece& rel, Link::LinkType* type) {
+ DCHECK(type);
for (size_t i = 0; i < arraysize(kLinkTypeMap); i++) {
if (rel == kLinkTypeMap[i].rel) {
- *result = kLinkTypeMap[i].type;
+ *type = kLinkTypeMap[i].type;
return true;
}
}
+
+ // OPEN_WITH links have extra information at the end of the rel that is unique
+ // for each one, so we can't just check the usual map. This check is slightly
+ // redundant to provide a quick skip if it's obviously not an OPEN_WITH url.
+ if (rel.size() >= kOpenWithPrefixSize &&
+ StartsWithASCII(rel.as_string(), kOpenWithPrefix, false)) {
+ *type = OPEN_WITH;
+ return true;
+ }
+
// Let unknown link types through, just report it; if the link type is needed
// in the future, add it into LinkType and kLinkTypeMap.
DVLOG(1) << "Ignoring unknown link type for rel " << rel;
- *result = UNKNOWN;
+ *type = UNKNOWN;
return true;
}
// static
void Link::RegisterJSONConverter(base::JSONValueConverter<Link>* converter) {
- converter->RegisterCustomField<Link::LinkType>(
- kRelField, &Link::type_, &Link::GetLinkType);
+ converter->RegisterCustomField<Link::LinkType>(kRelField,
+ &Link::type_,
+ &Link::GetLinkType);
+ // We have to register kRelField twice because we extract two different pieces
+ // of data from the same rel field.
+ converter->RegisterCustomField<std::string>(kRelField,
+ &Link::app_id_,
+ &Link::GetAppID);
converter->RegisterCustomField(kHrefField, &Link::href_, &GetGURLFromString);
converter->RegisterStringField(kTitleField, &Link::title_);
converter->RegisterStringField(kTypeField, &Link::mime_type_);
@@ -313,8 +353,11 @@ Link* Link::CreateFromXml(XmlReader* xml_reader) {
link->href_ = GURL(href);
std::string rel;
- if (xml_reader->NodeAttribute(kRelAttr, &rel))
+ if (xml_reader->NodeAttribute(kRelAttr, &rel)) {
GetLinkType(rel, &link->type_);
+ if (link->type_ == OPEN_WITH)
+ GetAppID(rel, &link->app_id_);
+ }
return link;
}
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_parser.h ('k') | chrome/browser/chromeos/gdata/gdata_parser_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698