Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1050)

Unified Diff: chrome/browser/chromeos/extensions/file_browser_event_router.h

Issue 9719012: Revert 127317 - Implemented API for tracking ongoing file transfers from file manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/extensions/file_browser_event_router.h
===================================================================
--- chrome/browser/chromeos/extensions/file_browser_event_router.h (revision 127330)
+++ chrome/browser/chromeos/extensions/file_browser_event_router.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -16,24 +16,17 @@
#include "base/string16.h"
#include "base/synchronization/lock.h"
#include "chrome/browser/chromeos/disks/disk_mount_manager.h"
-#include "chrome/browser/chromeos/gdata/gdata_file_system.h"
-#include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
-#include "chrome/browser/profiles/profile_keyed_service.h"
-#include "chrome/browser/profiles/profile_keyed_service_factory.h"
class FileBrowserNotifications;
class Profile;
// Used to monitor disk mount changes and signal when new mounted usb device is
// found.
-class FileBrowserEventRouter
- : public ProfileKeyedService,
- public chromeos::disks::DiskMountManager::Observer,
- public gdata::GDataOperationRegistry::Observer {
+class ExtensionFileBrowserEventRouter
+ : public chromeos::disks::DiskMountManager::Observer {
public:
- // ProfileKeyedService overrides.
- virtual void Shutdown() OVERRIDE;
-
+ explicit ExtensionFileBrowserEventRouter(Profile* profile);
+ virtual ~ExtensionFileBrowserEventRouter();
// Starts observing file system change events. Currently only
// CrosDisksClient events are being observed.
void ObserveFileSystemEvents();
@@ -57,18 +50,11 @@
const chromeos::disks::DiskMountManager::MountPointInfo& mount_info)
OVERRIDE;
- // GDataOperationRegistry::Observer overrides.
- virtual void OnProgressUpdate(
- const std::vector<gdata::GDataOperationRegistry::ProgressStatus>& list)
- OVERRIDE;
-
private:
- friend class FileBrowserEventRouterFactory;
-
// Helper class for passing through file watch notification events.
class FileWatcherDelegate : public base::files::FilePathWatcher::Delegate {
public:
- explicit FileWatcherDelegate(FileBrowserEventRouter* router);
+ explicit FileWatcherDelegate(ExtensionFileBrowserEventRouter* router);
private:
// base::files::FilePathWatcher::Delegate overrides.
@@ -77,7 +63,7 @@
void HandleFileWatchOnUIThread(const FilePath& local_path, bool got_error);
- FileBrowserEventRouter* router_;
+ ExtensionFileBrowserEventRouter* router_;
};
typedef std::map<std::string, int> ExtensionUsageRegistry;
@@ -111,9 +97,6 @@
typedef std::map<FilePath, FileWatcherExtensions*> WatcherMap;
- explicit FileBrowserEventRouter(Profile* profile);
- virtual ~FileBrowserEventRouter();
-
// USB mount event handlers.
void OnDiskAdded(const chromeos::disks::DiskMountManager::Disk* disk);
void OnDiskRemoved(const chromeos::disks::DiskMountManager::Disk* disk);
@@ -156,30 +139,7 @@
Profile* profile_;
base::Lock lock_;
- DISALLOW_COPY_AND_ASSIGN(FileBrowserEventRouter);
+ DISALLOW_COPY_AND_ASSIGN(ExtensionFileBrowserEventRouter);
};
-// Singleton that owns all FileBrowserEventRouter and associates
-// them with Profiles.
-class FileBrowserEventRouterFactory
- : public ProfileKeyedServiceFactory {
- public:
- // Returns the FileBrowserEventRouter for |profile|, creating it if
- // it is not yet created.
- static FileBrowserEventRouter* GetForProfile(Profile* profile);
-
- // Returns the FileBrowserEventRouterFactory instance.
- static FileBrowserEventRouterFactory* GetInstance();
-
- private:
- friend struct DefaultSingletonTraits<FileBrowserEventRouterFactory>;
-
- FileBrowserEventRouterFactory();
- virtual ~FileBrowserEventRouterFactory();
-
- // ProfileKeyedServiceFactory:
- virtual ProfileKeyedService* BuildServiceInstanceFor(
- Profile* profile) const OVERRIDE;
-};
-
#endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_
« no previous file with comments | « no previous file | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698