Index: chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc |
diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc |
index 9350683dcc5999868714271fb80294151b7259ec..136aeeacb4ede8f4d37e6cf53a18d94d4e561bb3 100644 |
--- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc |
+++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc |
@@ -194,7 +194,6 @@ void MediaGalleriesPrivateAddGalleryWatchFunction::OnPreferencesInit( |
return; |
} |
-#if defined(OS_WIN) || defined(OS_LINUX) |
MediaGalleriesPrivateEventRouter* router = |
MediaGalleriesPrivateAPI::Get(GetProfile())->GetEventRouter(); |
DCHECK(router); |
@@ -210,11 +209,6 @@ void MediaGalleriesPrivateAddGalleryWatchFunction::OnPreferencesInit( |
base::Bind(&MediaGalleriesPrivateAddGalleryWatchFunction::HandleResponse, |
this, |
gallery_pref_id)); |
-#else |
- // Recursive gallery watch operation is not currently supported on Mac: |
- // crbug.com/144491 |
- HandleResponse(gallery_pref_id, false); |
-#endif |
} |
void MediaGalleriesPrivateAddGalleryWatchFunction::HandleResponse( |
@@ -250,8 +244,6 @@ bool MediaGalleriesPrivateRemoveGalleryWatchFunction::RunAsync() { |
if (!render_view_host() || !render_view_host()->GetProcess()) |
return false; |
- // Remove gallery watch operation is currently supported on Mac: |
- // crbug.com/144491 |
scoped_ptr<RemoveGalleryWatch::Params> params( |
RemoveGalleryWatch::Params::Create(*args_)); |
EXTENSION_FUNCTION_VALIDATE(params.get()); |
@@ -268,7 +260,6 @@ bool MediaGalleriesPrivateRemoveGalleryWatchFunction::RunAsync() { |
void MediaGalleriesPrivateRemoveGalleryWatchFunction::OnPreferencesInit( |
const std::string& pref_id) { |
-#if defined(OS_WIN) || defined(OS_LINUX) |
base::FilePath gallery_file_path; |
MediaGalleryPrefId gallery_pref_id = 0; |
if (!GetGalleryFilePathAndId(pref_id, |
@@ -292,7 +283,6 @@ void MediaGalleriesPrivateRemoveGalleryWatchFunction::OnPreferencesInit( |
GalleryWatchStateTracker* state_tracker = MediaGalleriesPrivateAPI::Get( |
GetProfile())->GetGalleryWatchStateTracker(); |
state_tracker->OnGalleryWatchRemoved(extension_id(), gallery_pref_id); |
-#endif |
SendResponse(true); |
} |
@@ -320,7 +310,6 @@ bool MediaGalleriesPrivateGetAllGalleryWatchFunction::RunAsync() { |
void MediaGalleriesPrivateGetAllGalleryWatchFunction::OnPreferencesInit() { |
std::vector<std::string> result; |
-#if defined(OS_WIN) || defined(OS_LINUX) |
GalleryWatchStateTracker* state_tracker = MediaGalleriesPrivateAPI::Get( |
GetProfile())->GetGalleryWatchStateTracker(); |
MediaGalleryPrefIdSet gallery_ids = |
@@ -329,7 +318,6 @@ void MediaGalleriesPrivateGetAllGalleryWatchFunction::OnPreferencesInit() { |
iter != gallery_ids.end(); ++iter) { |
result.push_back(base::Uint64ToString(*iter)); |
} |
-#endif |
results_ = GetAllGalleryWatch::Results::Create(result); |
SendResponse(true); |
} |
@@ -357,7 +345,6 @@ bool MediaGalleriesPrivateRemoveAllGalleryWatchFunction::RunAsync() { |
} |
void MediaGalleriesPrivateRemoveAllGalleryWatchFunction::OnPreferencesInit() { |
-#if defined(OS_WIN) || defined(OS_LINUX) |
MediaGalleriesPreferences* preferences = |
g_browser_process->media_file_system_registry()->GetPreferences( |
GetProfile()); |
@@ -365,7 +352,6 @@ void MediaGalleriesPrivateRemoveAllGalleryWatchFunction::OnPreferencesInit() { |
GetProfile())->GetGalleryWatchStateTracker(); |
state_tracker->RemoveAllGalleryWatchersForExtension( |
extension_id(), preferences); |
-#endif |
SendResponse(true); |
} |