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

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

Issue 10836137: gdata: Remove hide_hosted_documents from ReadDirectoryCallback (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/gdata/gdata_file_system_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/gdata/gdata_file_system.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_file_system.cc b/chrome/browser/chromeos/gdata/gdata_file_system.cc
index 7de41a36a6ec23d187a3d38ab6c08b74775cb6e0..3843ec98f417e35432e02ca44597aea865c898af 100644
--- a/chrome/browser/chromeos/gdata/gdata_file_system.cc
+++ b/chrome/browser/chromeos/gdata/gdata_file_system.cc
@@ -516,7 +516,6 @@ GDataFileSystem::GDataFileSystem(
documents_service_(documents_service),
webapps_registry_(webapps_registry),
update_timer_(true /* retain_user_task */, true /* is_repeating */),
- hide_hosted_docs_(false),
blocking_task_runner_(blocking_task_runner),
ui_weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
ui_weak_ptr_(ui_weak_ptr_factory_.GetWeakPtr()) {
@@ -537,9 +536,6 @@ void GDataFileSystem::Initialize() {
blocking_task_runner_));
feed_loader_->AddObserver(this);
- PrefService* pref_service = profile_->GetPrefs();
- hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableGDataHostedFiles);
-
InitializePreferenceObserver();
}
@@ -1866,7 +1862,6 @@ void GDataFileSystem::OnReadDirectory(const ReadDirectoryCallback& callback,
if (error != GDATA_FILE_OK) {
if (!callback.is_null())
callback.Run(error,
- hide_hosted_docs_,
scoped_ptr<GDataEntryProtoVector>());
return;
}
@@ -1876,7 +1871,6 @@ void GDataFileSystem::OnReadDirectory(const ReadDirectoryCallback& callback,
if (!directory) {
if (!callback.is_null())
callback.Run(GDATA_FILE_ERROR_NOT_FOUND,
- hide_hosted_docs_,
scoped_ptr<GDataEntryProtoVector>());
return;
}
@@ -1898,7 +1892,7 @@ void GDataFileSystem::OnReadDirectory(const ReadDirectoryCallback& callback,
}
if (!callback.is_null())
- callback.Run(GDATA_FILE_OK, hide_hosted_docs_, entries.Pass());
+ callback.Run(GDATA_FILE_OK, entries.Pass());
}
void GDataFileSystem::RequestDirectoryRefresh(const FilePath& file_path) {
@@ -2985,10 +2979,6 @@ void GDataFileSystem::Observe(int type,
void GDataFileSystem::SetHideHostedDocuments(bool hide) {
achuithb 2012/08/07 21:35:45 This function is weird now. hide is unused. The fu
satorux1 2012/08/07 21:48:07 Good point. Removed the function. The only thing w
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (hide == hide_hosted_docs_)
- return;
-
- hide_hosted_docs_ = hide;
const FilePath root_path = directory_service_->root()->GetFilePath();
// Kick off directory refresh when this setting changes.
« no previous file with comments | « no previous file | chrome/browser/chromeos/gdata/gdata_file_system_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698