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

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

Issue 7471024: Formatting feature initial commit for ChromeOS Tree (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: final. Created 9 years, 5 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
Index: chrome/browser/chromeos/extensions/file_browser_event_router.h
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.h b/chrome/browser/chromeos/extensions/file_browser_event_router.h
index ebc7f6c4a803da2ff45135ac89f6d9636558a91b..835564974c0bf2d8a3c431149e8814c3e4b752dc 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.h
@@ -27,6 +27,11 @@ class SystemNotification;
// found.
class ExtensionFileBrowserEventRouter
: public chromeos::MountLibrary::Observer {
+
+ friend void HideFileBrowserNotificationExternally(
+ const std::string& category, const std::string& system_path,
+ ExtensionFileBrowserEventRouter* that);
+
public:
explicit ExtensionFileBrowserEventRouter(Profile* profile);
virtual ~ExtensionFileBrowserEventRouter();
@@ -56,7 +61,8 @@ class ExtensionFileBrowserEventRouter
NotificationMap;
typedef std::map<std::string, std::string> MountPointMap;
typedef struct FileWatcherExtensions {
- FileWatcherExtensions(const FilePath& path, const std::string& extension_id) {
+ FileWatcherExtensions(const FilePath& path,
+ const std::string& extension_id) {
file_watcher.reset(new base::files::FilePathWatcher());
virtual_path = path;
extensions.insert(extension_id);
@@ -88,13 +94,17 @@ class ExtensionFileBrowserEventRouter
void OnDiskAdded(const chromeos::MountLibrary::Disk* disk);
void OnDiskRemoved(const chromeos::MountLibrary::Disk* disk);
void OnDiskChanged(const chromeos::MountLibrary::Disk* disk);
+ void OnDiskMounted(const chromeos::MountLibrary::Disk* disk);
+ void OnDiskUnmounted(const chromeos::MountLibrary::Disk* disk);
void OnDeviceAdded(const std::string& device_path);
void OnDeviceRemoved(const std::string& device_path);
void OnDeviceScanned(const std::string& device_path);
+ void OnFormattingStarted(const std::string& device_path);
+ void OnFormattingFinished(const std::string& device_path);
// Finds first notifications corresponding to the same device. Ensures that
// we don't pop up multiple notifications for the same device.
- NotificationMap::iterator FindNotificationForPath(const std::string& path);
+ NotificationMap::iterator FindNotificationForId(const std::string& path);
// Process file watch notifications.
void HandleFileWatchNotification(const FilePath& path,
@@ -120,10 +130,13 @@ class ExtensionFileBrowserEventRouter
bool small);
// Show/hide desktop notifications.
- void ShowDeviceNotification(const std::string& system_path,
- int icon_resource_id,
- const string16& message);
- void HideDeviceNotification(const std::string& system_path);
+ void ShowFileBrowserNotification(const std::string& category,
+ const std::string& system_path,
+ int icon_resource_id,
+ const string16& title,
+ const string16& message);
+ void HideFileBrowserNotification(const std::string& category,
+ const std::string& system_path);
scoped_refptr<FileWatcherDelegate> delegate_;
MountPointMap mounted_devices_;
« no previous file with comments | « chrome/browser/chromeos/cros/mount_library.cc ('k') | chrome/browser/chromeos/extensions/file_browser_event_router.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698