drive: Introduce DriveSystemServiceObserver

chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.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/extensions/file_manager/file_manager_event_router.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
@@ skipping 275 matching lines @@
   if (key_event_listener)
     key_event_listener->RemoveModifiersObserver(this);
 
   DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
   if (disk_mount_manager)
     disk_mount_manager->RemoveObserver(this);
 
   DriveSystemService* system_service =
       DriveSystemServiceFactory::FindForProfileRegardlessOfStates(profile_);
   if (system_service) {
+    system_service->RemoveObserver(this);
     system_service->file_system()->RemoveObserver(this);
     system_service->drive_service()->RemoveObserver(this);
   }
 
   if (chromeos::ConnectivityStateHelper::IsInitialized()) {
     chromeos::ConnectivityStateHelper::Get()->
         RemoveNetworkManagerObserver(this);
   }
   profile_ = NULL;
 }
 
 void FileManagerEventRouter::ObserveFileSystemEvents() {
   if (!profile_) {
     NOTREACHED();
     return;
   }
   if (!chromeos::UserManager::Get()->IsUserLoggedIn())
     return;
 
   DiskMountManager* disk_mount_manager = DiskMountManager::GetInstance();
   if (disk_mount_manager) {
     disk_mount_manager->RemoveObserver(this);
     disk_mount_manager->AddObserver(this);
     disk_mount_manager->RequestMountInfoRefresh();
   }
 
   DriveSystemService* system_service =
       DriveSystemServiceFactory::GetForProfileRegardlessOfStates(profile_);
   if (system_service) {
+    system_service->AddObserver(this);
     system_service->drive_service()->AddObserver(this);
     system_service->file_system()->AddObserver(this);
   }
 
   if (chromeos::ConnectivityStateHelper::IsInitialized()) {
     chromeos::ConnectivityStateHelper::Get()->
         AddNetworkManagerObserver(this);
   }
   suspend_state_delegate_.reset(new SuspendStateDelegateImpl());
 
@@ skipping 652 matching lines @@
     base::FilePathWatcher* file_watcher) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (file_watcher) {
     file_watcher_ = file_watcher;
     callback.Run(true);
   } else {
     callback.Run(false);
   }
 }