Revert 151911 - Fixing gdata updates in the system tray.

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 190 matching lines @@
                    chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                    content::NotificationService::AllSources());
     if (GetUserLoginStatus() == ash::user::LOGGED_IN_NONE) {
       registrar_.Add(this,
                      chrome::NOTIFICATION_SESSION_STARTED,
                      content::NotificationService::AllSources());
     }
     registrar_.Add(this,
                    chrome::NOTIFICATION_PROFILE_CREATED,
                    content::NotificationService::AllSources());
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_LOGIN_USER_CHANGED,
-                   content::NotificationService::AllSources());
 
     accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled,
                                 g_browser_process->local_state(), this);
 
     network_icon_->SetResourceColorTheme(NetworkMenuIcon::COLOR_LIGHT);
     network_icon_dark_->SetResourceColorTheme(NetworkMenuIcon::COLOR_DARK);
 
     bluetooth_adapter_ = BluetoothAdapter::DefaultAdapter();
     bluetooth_adapter_->AddObserver(this);
   }
 
   virtual ~SystemTrayDelegate() {
     AudioHandler* audiohandler = AudioHandler::GetInstance();
     if (audiohandler)
       audiohandler->RemoveVolumeObserver(this);
     DBusThreadManager::Get()->GetSessionManagerClient()->RemoveObserver(this);
     DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
     NetworkLibrary* crosnet = CrosLibrary::Get()->GetNetworkLibrary();
     if (crosnet) {
       crosnet->RemoveNetworkManagerObserver(this);
       crosnet->RemoveCellularDataPlanObserver(this);
     }
     input_method::InputMethodManager::GetInstance()->RemoveObserver(this);
     system::TimezoneSettings::GetInstance()->RemoveObserver(this);
     if (SystemKeyEventListener::GetInstance())
       SystemKeyEventListener::GetInstance()->RemoveCapsLockObserver(this);
     bluetooth_adapter_->RemoveObserver(this);
 
     // Stop observing gdata operations.
-    GDataSystemService* system_service = FindGDataSystemService();
-    if (system_service) {
-      system_service->docs_service()->operation_registry()->
-          RemoveObserver(this);
+    Profile* profile = ProfileManager::GetDefaultProfile();
+    if (gdata::util::IsGDataAvailable(profile)) {
+      GDataSystemService* system_service =
+          GDataSystemServiceFactory::FindForProfile(profile);
+      if (system_service) {
+        system_service->docs_service()->operation_registry()->
+            RemoveObserver(this);
+      }
     }
   }
 
   // Overridden from ash::SystemTrayDelegate:
   virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
     // In case of OOBE / sign in screen tray will be shown later.
     return UserManager::Get()->IsUserLoggedIn();
   }
 
   virtual const string16 GetUserDisplayName() const OVERRIDE {
@@ skipping 188 matching lines @@
   virtual void SwitchIME(const std::string& ime_id) OVERRIDE {
     input_method::InputMethodManager::GetInstance()->ChangeInputMethod(ime_id);
   }
 
   virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
     input_method::InputMethodManager::GetInstance()->
         ActivateInputMethodProperty(key);
   }
 
   virtual void CancelDriveOperation(const FilePath& file_path) OVERRIDE {
-    GDataSystemService* system_service = FindGDataSystemService();
+    Profile* profile = ProfileManager::GetDefaultProfile();
+    if (!gdata::util::IsGDataAvailable(profile))
+      return;
+
+    GDataSystemService* system_service =
+          GDataSystemServiceFactory::FindForProfile(profile);
     if (!system_service)
       return;
 
     system_service->docs_service()->operation_registry()->CancelForFilePath(
         file_path);
   }
 
   virtual void GetDriveOperationStatusList(
       ash::DriveOperationStatusList* list) OVERRIDE {
-    GDataSystemService* system_service = FindGDataSystemService();
+    Profile* profile = ProfileManager::GetDefaultProfile();
+    if (!gdata::util::IsGDataAvailable(profile))
+      return;
+
+    GDataSystemService* system_service =
+          GDataSystemServiceFactory::FindForProfile(profile);
     if (!system_service)
       return;
 
     *list = GetDriveStatusList(
         system_service->docs_service()->operation_registry()->
             GetProgressStatusList());
   }
 
 
   virtual void GetMostRelevantNetworkIcon(ash::NetworkIconInfo* info,
@@ skipping 242 matching lines @@
   }
 
   void SetProfile(Profile* profile) {
     pref_registrar_.reset(new PrefChangeRegistrar);
     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);
-  }
 
-  void ObserveGDataUpdates() {
-    GDataSystemService* system_service = FindGDataSystemService();
-    if (!system_service)
-      return;
+    if (gdata::util::IsGDataAvailable(profile)) {
+      GDataSystemService* system_service =
+          GDataSystemServiceFactory::FindForProfile(profile);
+      if (!system_service)
+        return;
 
-    system_service->docs_service()->operation_registry()->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 274 matching lines @@
       case chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED: {
         // This notification is also sent on login screen when user avatar
         // is loaded from file.
         if (GetUserLoginStatus() != ash::user::LOGGED_IN_NONE) {
           ash::UserObserver* observer = tray_->user_observer();
           if (observer)
             observer->OnUserUpdate();
         }
         break;
       }
-      case chrome::NOTIFICATION_LOGIN_USER_CHANGED: {
-        // GData system service exists by the time if enabled.
-        ObserveGDataUpdates();
-        break;
-      }
       case chrome::NOTIFICATION_PREF_CHANGED: {
         std::string pref = *content::Details<std::string>(details).ptr();
         PrefService* service = content::Source<PrefService>(source).ptr();
         if (pref == prefs::kUse24HourClock) {
           UpdateClockType(service);
         } else if (pref == prefs::kLanguageXkbRemapSearchKeyTo) {
           search_key_mapped_to_ =
               service->GetInteger(prefs::kLanguageXkbRemapSearchKeyTo);
         } else if (pref == prefs::kSpokenFeedbackEnabled) {
           ash::AccessibilityObserver* observer =
@@ skipping 71 matching lines @@
       }
     }
 
   }
 
   // Pulls the list of ongoing drive operations and initiates status update.
   // 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() {
-    GDataSystemService* system_service = FindGDataSystemService();
+    Profile* profile = ProfileManager::GetDefaultProfile();
+    if (!gdata::util::IsGDataAvailable(profile))
+      return;
+
+    GDataSystemService* system_service =
+          GDataSystemServiceFactory::FindForProfile(profile);
     if (!system_service)
       return;
 
     OnProgressUpdate(system_service->docs_service()->operation_registry()->
         GetProgressStatusList());
   }
 
-  GDataSystemService* FindGDataSystemService() {
-    Profile* profile = ProfileManager::GetDefaultProfile();
-    if (!gdata::util::IsGDataAvailable(profile))
-      return NULL;
-    return GDataSystemServiceFactory::FindForProfile(profile);
-  }
-
   // Overridden from system::TimezoneSettings::Observer.
   virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE {
     NotifyRefreshClock();
   }
 
   // Overridden from BluetoothAdapter::Observer.
   virtual void AdapterPresentChanged(BluetoothAdapter* adapter,
                                      bool present) OVERRIDE {
     NotifyRefreshBluetooth();
   }
@@ skipping 98 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos