Revert 150436 - gdata: Remove hide_hosted_documents from ReadDirectoryCallback

chrome/browser/chromeos/gdata/gdata_file_system.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 498 matching lines @@
     DocumentsServiceInterface* documents_service,
     GDataUploaderInterface* uploader,
     DriveWebAppsRegistryInterface* webapps_registry,
     base::SequencedTaskRunner* blocking_task_runner)
     : profile_(profile),
       cache_(cache),
       uploader_(uploader),
       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()) {
   // Should be created from the file browser extension API on UI thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 void GDataFileSystem::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   documents_service_->Initialize(profile_);
 
   directory_service_.reset(new GDataDirectoryService);
   feed_loader_.reset(new GDataWapiFeedLoader(directory_service_.get(),
                                              documents_service_,
                                              webapps_registry_,
                                              cache_,
                                              blocking_task_runner_));
   feed_loader_->AddObserver(this);
 
+  PrefService* pref_service = profile_->GetPrefs();
+  hide_hosted_docs_ = pref_service->GetBoolean(prefs::kDisableGDataHostedFiles);
+
   InitializePreferenceObserver();
 }
 
 void GDataFileSystem::CheckForUpdates() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ContentOrigin initial_origin = directory_service_->origin();
   if (initial_origin == FROM_SERVER) {
     directory_service_->set_origin(REFRESHING);
     feed_loader_->ReloadFromServerIfNeeded(
         initial_origin,
@@ skipping 1306 matching lines @@
 }
 
 void GDataFileSystem::OnReadDirectory(const ReadDirectoryCallback& callback,
                                       GDataFileError error,
                                       GDataEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (error != GDATA_FILE_OK) {
     if (!callback.is_null())
       callback.Run(error,
+                   hide_hosted_docs_,
                    scoped_ptr<GDataEntryProtoVector>());
     return;
   }
   DCHECK(entry);
 
   GDataDirectory* directory = entry->AsGDataDirectory();
   if (!directory) {
     if (!callback.is_null())
       callback.Run(GDATA_FILE_ERROR_NOT_FOUND,
+                   hide_hosted_docs_,
                    scoped_ptr<GDataEntryProtoVector>());
     return;
   }
 
   scoped_ptr<GDataEntryProtoVector> entries(new GDataEntryProtoVector);
   for (GDataFileCollection::const_iterator iter =
            directory->child_files().begin();
        iter != directory->child_files().end(); ++iter) {
     GDataEntryProto proto;
     static_cast<const GDataEntry*>(iter->second)->ToProtoFull(&proto);
     entries->push_back(proto);
   }
   for (GDataDirectoryCollection::const_iterator iter =
            directory->child_directories().begin();
        iter != directory->child_directories().end(); ++iter) {
     GDataEntryProto proto;
     static_cast<const GDataEntry*>(iter->second)->ToProtoFull(&proto);
     entries->push_back(proto);
   }
 
   if (!callback.is_null())
-    callback.Run(GDATA_FILE_OK, entries.Pass());
+    callback.Run(GDATA_FILE_OK, hide_hosted_docs_, entries.Pass());
 }
 
 void GDataFileSystem::RequestDirectoryRefresh(const FilePath& file_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
   RunTaskOnUIThread(
       base::Bind(&GDataFileSystem::RequestDirectoryRefreshOnUIThread,
                  ui_weak_ptr_,
                  file_path));
 }
@@ skipping 1051 matching lines @@
     NOTREACHED() << "Unexpected upload mode: " << upload_mode;
   }
 }
 
 void GDataFileSystem::Observe(int type,
                               const content::NotificationSource& source,
                               const content::NotificationDetails& details) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
+    PrefService* pref_service = profile_->GetPrefs();
     std::string* pref_name = content::Details<std::string>(details).ptr();
     if (*pref_name == prefs::kDisableGDataHostedFiles) {
-      const FilePath root_path = directory_service_->root()->GetFilePath();
-      // Kick off directory refresh when this setting changes.
-      FOR_EACH_OBSERVER(GDataFileSystemInterface::Observer, observers_,
-                        OnDirectoryChanged(root_path));
+      SetHideHostedDocuments(
+          pref_service->GetBoolean(prefs::kDisableGDataHostedFiles));
     }
   } else {
     NOTREACHED();
   }
 }
 
+void GDataFileSystem::SetHideHostedDocuments(bool hide) {
+  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.
+  FOR_EACH_OBSERVER(GDataFileSystemInterface::Observer, observers_,
+                    OnDirectoryChanged(root_path));
+}
+
 //============= GDataFileSystem: internal helper functions =====================
 
 void GDataFileSystem::InitializePreferenceObserver() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   pref_registrar_.reset(new PrefChangeRegistrar());
   pref_registrar_->Init(profile_->GetPrefs());
   pref_registrar_->Add(prefs::kDisableGDataHostedFiles, this);
 }
 
@@ skipping 416 matching lines @@
   }
 
   PlatformFileInfoProto entry_file_info;
   GDataEntry::ConvertPlatformFileInfoToProto(*file_info, &entry_file_info);
   *entry_proto->mutable_file_info() = entry_file_info;
   if (!callback.is_null())
     callback.Run(GDATA_FILE_OK, entry_proto.Pass());
 }
 
 }  // namespace gdata