summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 21:16:34 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 21:16:34 +0000
commitb7766af248a01b30e039161a870b18a423cf4edb (patch)
tree7ca203f5aaa012ffea6921a57410283e2e5c19de
parentb608c5990c4995072f99d9e53c0b4e1935246be7 (diff)
downloadchromium_src-b7766af248a01b30e039161a870b18a423cf4edb.zip
chromium_src-b7766af248a01b30e039161a870b18a423cf4edb.tar.gz
chromium_src-b7766af248a01b30e039161a870b18a423cf4edb.tar.bz2
Remove start_feed_url and next_feed_url from GDataDirectory and proto
These are unused. BUG=137882 TEST=out/Release/unit_tests --gtest_filter=GData* Review URL: https://chromiumcodereview.appspot.com/10808060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147718 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/gdata/gdata.proto2
-rw-r--r--chrome/browser/chromeos/gdata/gdata_files.cc7
-rw-r--r--chrome/browser/chromeos/gdata/gdata_files.h11
3 files changed, 0 insertions, 20 deletions
diff --git a/chrome/browser/chromeos/gdata/gdata.proto b/chrome/browser/chromeos/gdata/gdata.proto
index ddbad67..08a5dce 100644
--- a/chrome/browser/chromeos/gdata/gdata.proto
+++ b/chrome/browser/chromeos/gdata/gdata.proto
@@ -50,8 +50,6 @@ message GDataFileProto {
// Represents GDataDirectory.
message GDataDirectoryProto {
optional GDataEntryProto gdata_entry = 1;
- optional string start_feed_url = 3;
- optional string next_feed_url = 4;
repeated GDataDirectoryProto child_directories = 7;
repeated GDataFileProto child_files = 8;
}
diff --git a/chrome/browser/chromeos/gdata/gdata_files.cc b/chrome/browser/chromeos/gdata/gdata_files.cc
index 5f656c7..9866b40 100644
--- a/chrome/browser/chromeos/gdata/gdata_files.cc
+++ b/chrome/browser/chromeos/gdata/gdata_files.cc
@@ -262,8 +262,6 @@ GDataEntry* GDataDirectory::FromDocumentEntry(
dir->file_info_.last_modified = doc->updated_time();
dir->file_info_.last_accessed = doc->updated_time();
dir->file_info_.creation_time = doc->published_time();
- // Extract feed link.
- dir->start_feed_url_ = doc->content_url();
dir->resource_id_ = doc->resource_id();
dir->content_url_ = doc->content_url();
dir->deleted_ = doc->deleted();
@@ -658,17 +656,12 @@ bool GDataDirectory::FromProto(const GDataDirectoryProto& proto) {
if (!GDataEntry::FromProto(proto.gdata_entry()))
return false;
- start_feed_url_ = GURL(proto.start_feed_url());
- next_feed_url_ = GURL(proto.next_feed_url());
-
return true;
}
void GDataDirectory::ToProto(GDataDirectoryProto* proto) const {
GDataEntry::ToProto(proto->mutable_gdata_entry());
DCHECK(proto->gdata_entry().file_info().is_directory());
- proto->set_start_feed_url(start_feed_url_.spec());
- proto->set_next_feed_url(next_feed_url_.spec());
for (GDataFileCollection::const_iterator iter = child_files_.begin();
iter != child_files_.end(); ++iter) {
GDataFile* file = iter->second;
diff --git a/chrome/browser/chromeos/gdata/gdata_files.h b/chrome/browser/chromeos/gdata/gdata_files.h
index f73c90d..d4d2700 100644
--- a/chrome/browser/chromeos/gdata/gdata_files.h
+++ b/chrome/browser/chromeos/gdata/gdata_files.h
@@ -292,12 +292,6 @@ class GDataDirectory : public GDataEntry {
void RemoveChildFiles();
void RemoveChildDirectories();
- // Url for this feed.
- const GURL& start_feed_url() const { return start_feed_url_; }
- void set_start_feed_url(const GURL& url) { start_feed_url_ = url; }
- // Continuing feed's url.
- const GURL& next_feed_url() const { return next_feed_url_; }
- void set_next_feed_url(const GURL& url) { next_feed_url_ = url; }
// Collection of children files/directories.
const GDataFileCollection& child_files() const { return child_files_; }
const GDataDirectoryCollection& child_directories() const {
@@ -312,11 +306,6 @@ class GDataDirectory : public GDataEntry {
// entry instance.
bool RemoveChild(GDataEntry* entry);
- // Url for this feed.
- GURL start_feed_url_;
- // Continuing feed's url.
- GURL next_feed_url_;
-
// Collection of children GDataEntry items.
GDataFileCollection child_files_;
GDataDirectoryCollection child_directories_;