| Index: chrome/browser/chromeos/extensions/file_manager/event_router.h
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h
|
| index 7e094d6a1926f7a9a24149e389bd7ba7a530c60b..7d187ea30097696c0b47b7b46c41a38e52d18dc8 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager/event_router.h
|
| +++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
|
| @@ -21,12 +21,9 @@
|
| #include "chrome/browser/chromeos/file_manager/volume_manager.h"
|
| #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
|
| #include "chrome/browser/drive/drive_service_interface.h"
|
| -#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
|
| #include "chrome/common/extensions/api/file_browser_private.h"
|
| #include "chromeos/disks/disk_mount_manager.h"
|
| #include "chromeos/network/network_state_handler_observer.h"
|
| -#include "content/public/browser/notification_observer.h"
|
| -#include "content/public/browser/notification_registrar.h"
|
| #include "webkit/browser/fileapi/file_system_operation.h"
|
|
|
| class PrefChangeRegistrar;
|
| @@ -51,14 +48,11 @@ class DeviceEventRouter;
|
|
|
| // Monitors changes in disk mounts, network connection state and preferences
|
| // affecting File Manager. Dispatches appropriate File Browser events.
|
| -class EventRouter
|
| - : public chromeos::NetworkStateHandlerObserver,
|
| - public drive::FileSystemObserver,
|
| - public drive::JobListObserver,
|
| - public drive::DriveServiceObserver,
|
| - public VolumeManagerObserver,
|
| - public content::NotificationObserver,
|
| - public chrome::MultiUserWindowManager::Observer {
|
| +class EventRouter : public chromeos::NetworkStateHandlerObserver,
|
| + public drive::FileSystemObserver,
|
| + public drive::JobListObserver,
|
| + public drive::DriveServiceObserver,
|
| + public VolumeManagerObserver {
|
| public:
|
| explicit EventRouter(Profile* profile);
|
| virtual ~EventRouter();
|
| @@ -96,9 +90,6 @@ class EventRouter
|
| const GURL& destination_url,
|
| int64 size);
|
|
|
| - // Register observer to the multi user window manager.
|
| - void RegisterMultiUserWindowManagerObserver();
|
| -
|
| // chromeos::NetworkStateHandlerObserver overrides.
|
| virtual void DefaultNetworkChanged(
|
| const chromeos::NetworkState* network) OVERRIDE;
|
| @@ -135,14 +126,6 @@ class EventRouter
|
| virtual void OnFormatCompleted(
|
| const std::string& device_path, bool success) OVERRIDE;
|
|
|
| - // content::NotificationObserver overrides.
|
| - virtual void Observe(int type,
|
| - const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| -
|
| - // chrome::MultiUserWindowManager::Observer overrides:
|
| - virtual void OnOwnerEntryChanged(aura::Window* window) OVERRIDE;
|
| -
|
| private:
|
| typedef std::map<base::FilePath, FileWatcher*> WatcherMap;
|
|
|
| @@ -202,9 +185,6 @@ class EventRouter
|
| scoped_ptr<PrefChangeRegistrar> pref_change_registrar_;
|
| Profile* profile_;
|
|
|
| - content::NotificationRegistrar notification_registrar_;
|
| - bool multi_user_window_manager_observer_registered_;
|
| -
|
| scoped_ptr<DeviceEventRouter> device_event_router_;
|
|
|
| // Note: This should remain the last member so it'll be destroyed and
|
|
|