| Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
|
| diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
|
| index afd3d0b2943a68a550860b6576eb3342c7408e42..824fcea21b75dea031055a10d2e62db208eadb43 100644
|
| --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
|
| +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
|
| @@ -76,19 +76,17 @@ bool MediaGalleriesGetMediaFileSystemsFunction::RunImpl() {
|
| GetMediaFileSystems::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
| MediaGalleries::GetMediaFileSystemsInteractivity interactive =
|
| - MediaGalleries::MEDIA_GALLERIES_GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_NO;
|
| + MediaGalleries::GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_NO;
|
| if (params->details.get() && params->details->interactive != MediaGalleries::
|
| - MEDIA_GALLERIES_GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_NONE) {
|
| + GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_NONE) {
|
| interactive = params->details->interactive;
|
| }
|
|
|
| switch (interactive) {
|
| - case MediaGalleries::
|
| - MEDIA_GALLERIES_GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_YES:
|
| + case MediaGalleries::GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_YES:
|
| ShowDialog();
|
| return true;
|
| - case MediaGalleries::
|
| - MEDIA_GALLERIES_GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_IF_NEEDED: {
|
| + case MediaGalleries::GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_IF_NEEDED: {
|
| MediaFileSystemRegistry* registry =
|
| g_browser_process->media_file_system_registry();
|
| registry->GetMediaFileSystemsForExtension(
|
| @@ -98,12 +96,10 @@ bool MediaGalleriesGetMediaFileSystemsFunction::RunImpl() {
|
| this));
|
| return true;
|
| }
|
| - case MediaGalleries::
|
| - MEDIA_GALLERIES_GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_NO:
|
| + case MediaGalleries::GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_NO:
|
| GetAndReturnGalleries();
|
| return true;
|
| - case MediaGalleries::
|
| - MEDIA_GALLERIES_GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_NONE:
|
| + case MediaGalleries::GET_MEDIA_FILE_SYSTEMS_INTERACTIVITY_NONE:
|
| NOTREACHED();
|
| }
|
| error_ = kInvalidInteractive;
|
|
|