Remove chromeos::GDataFileSystem::GetOperationRegistry()

chrome/browser/chromeos/system/ash_system_tray_delegate.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/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
@@ skipping 13 matching lines @@
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/audio/audio_handler.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
+#include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/base_login_display_host.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
 #include "chrome/browser/chromeos/login/message_bubble.h"
 #include "chrome/browser/chromeos/login/user.h"
@@ skipping 184 matching lines @@
     system::TimezoneSettings::GetInstance()->RemoveObserver(this);
     if (SystemKeyEventListener::GetInstance())
       SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this);
     bluetooth_adapter_->RemoveObserver(this);
 
     // Stop observing gdata operations.
     Profile* profile = ProfileManager::GetDefaultProfile();
     if (gdata::util::IsGDataAvailable(profile)) {
       GDataSystemService* system_service =
           GDataSystemServiceFactory::FindForProfile(profile);
-      if (system_service && system_service->file_system()) {
-        system_service->file_system()->GetOperationRegistry()->
+      if (system_service) {
+        system_service->docs_service()->operation_registry()->
             RemoveObserver(this);
       }
     }
   }
 
   // Overridden from ash::SystemTrayDelegate:
   virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
     return !chromeos::KioskModeSettings::Get()->IsKioskModeEnabled();
   }
 
@@ skipping 208 matching lines @@
         ActivateInputMethodProperty(key);
   }
 
   virtual void CancelDriveOperation(const FilePath& file_path) OVERRIDE {
     Profile* profile = ProfileManager::GetDefaultProfile();
     if (!gdata::util::IsGDataAvailable(profile))
       return;
 
     GDataSystemService* system_service =
           GDataSystemServiceFactory::FindForProfile(profile);
-    if (!system_service || !system_service->file_system())
+    if (!system_service)
       return;
 
-    system_service->file_system()->GetOperationRegistry()->CancelForFilePath(
+    system_service->docs_service()->operation_registry()->CancelForFilePath(
         file_path);
   }
 
   virtual void GetDriveOperationStatusList(
       ash::DriveOperationStatusList* list) OVERRIDE {
     Profile* profile = ProfileManager::GetDefaultProfile();
     if (!gdata::util::IsGDataAvailable(profile))
       return;
 
     GDataSystemService* system_service =
           GDataSystemServiceFactory::FindForProfile(profile);
-    if (!system_service || !system_service->file_system())
+    if (!system_service)
       return;
 
     *list = GetDriveStatusList(
-        system_service->file_system()->GetOperationRegistry()->
+        system_service->docs_service()->operation_registry()->
             GetProgressStatusList());
   }
 
 
   virtual void GetMostRelevantNetworkIcon(ash::NetworkIconInfo* info,
                                           bool dark) OVERRIDE {
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     info->image = !dark ? network_icon_->GetIconAndText(&info->description) :
         network_icon_dark_->GetIconAndText(&info->description);
     info->tray_icon_visible =
@@ skipping 276 matching lines @@
     pref_registrar_->Init(profile->GetPrefs());
     pref_registrar_->Add(prefs::kUse24HourClock, this);
     pref_registrar_->Add(prefs::kLanguageXkbRemapSearchKeyTo, this);
     UpdateClockType(profile->GetPrefs());
     search_key_mapped_to_ =
         profile->GetPrefs()->GetInteger(prefs::kLanguageXkbRemapSearchKeyTo);
 
     if (gdata::util::IsGDataAvailable(profile)) {
       GDataSystemService* system_service =
           GDataSystemServiceFactory::FindForProfile(profile);
-      if (!system_service || !system_service->file_system())
+      if (!system_service)
         return;
 
-      system_service->file_system()->GetOperationRegistry()->
-          AddObserver(this);
+      system_service->docs_service()->operation_registry()->AddObserver(this);
     }
   }
 
   void UpdateClockType(PrefService* service) {
     clock_type_ = service->GetBoolean(prefs::kUse24HourClock) ?
         base::k24HourClock : base::k12HourClock;
     ash::ClockObserver* observer = tray_->clock_observer();
     if (observer)
       observer->OnDateFormatChanged();
   }
@@ skipping 313 matching lines @@
   // This method is needed to ensure delayed cleanup of the latest reported
   // status in UI in cases when there are no new changes coming (i.e. when the
   // last set of transfer operations completed).
   void RecheckGDataOperations() {
     Profile* profile = ProfileManager::GetDefaultProfile();
     if (!gdata::util::IsGDataAvailable(profile))
       return;
 
     GDataSystemService* system_service =
           GDataSystemServiceFactory::FindForProfile(profile);
-    if (!system_service || !system_service->file_system())
+    if (!system_service)
       return;
 
-    OnProgressUpdate(system_service->file_system()->GetOperationRegistry()->
+    OnProgressUpdate(system_service->docs_service()->operation_registry()->
         GetProgressStatusList());
   }
 
   // Overridden from system::TimezoneSettings::Observer.
   virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE {
     NotifyRefreshClock();
   }
 
   // Overridden from BluetoothAdapter::Observer.
   virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
@@ skipping 99 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos