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

Unified Diff: chrome/browser/chromeos/drive/change_list_loader.cc

Issue 166273011: Remove --enablde-drive-v2-api flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/drive_integration_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/drive/change_list_loader.cc
diff --git a/chrome/browser/chromeos/drive/change_list_loader.cc b/chrome/browser/chromeos/drive/change_list_loader.cc
index c831fe43ff736d50ef1918b5ee4f2f454e833745..b17ece26d3edd8742c81bd52df82167b5a325929 100644
--- a/chrome/browser/chromeos/drive/change_list_loader.cc
+++ b/chrome/browser/chromeos/drive/change_list_loader.cc
@@ -189,7 +189,6 @@ class FastFetchFeedFetcher : public ChangeListLoader::FeedFetcher {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(!callback.is_null());
DCHECK(!directory_resource_id_.empty());
- DCHECK(util::IsDriveV2ApiEnabled() || !root_folder_id_.empty());
// Remember the time stamp for usage stats.
start_time_ = base::TimeTicks::Now();
@@ -197,10 +196,10 @@ class FastFetchFeedFetcher : public ChangeListLoader::FeedFetcher {
// We use WAPI's GetResourceListInDirectory even if Drive API v2 is
// enabled. This is the short term work around of the performance
// regression.
+ // TODO(hashimoto): Remove this. crbug.com/340931.
std::string resource_id = directory_resource_id_;
- if (util::IsDriveV2ApiEnabled() &&
- directory_resource_id_ == root_folder_id_) {
+ if (directory_resource_id_ == root_folder_id_) {
// GData WAPI doesn't accept the root directory id which is used in Drive
// API v2. So it is necessary to translate it here.
resource_id = util::kWapiRootDirectoryResourceId;
@@ -229,8 +228,7 @@ class FastFetchFeedFetcher : public ChangeListLoader::FeedFetcher {
// Add the current change list to the list of collected lists.
DCHECK(resource_list);
ChangeList* change_list = new ChangeList(*resource_list);
- if (util::IsDriveV2ApiEnabled())
- FixResourceIdInChangeList(change_list);
+ FixResourceIdInChangeList(change_list);
change_lists_.push_back(change_list);
GURL next_url;
« no previous file with comments | « no previous file | chrome/browser/chromeos/drive/drive_integration_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698