Chromium Code Reviews| 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 e47fad262f8f5b78e1a872d721f749d96ab4d7f7..97ed1f5804a19e9042886eb8acc6e03de0aa54ce 100644 |
| --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc |
| +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc |
| @@ -70,14 +70,18 @@ bool MediaGalleriesGetMediaFileSystemsFunction::RunImpl() { |
| scoped_ptr<GetMediaFileSystems::Params> params( |
| GetMediaFileSystems::Params::Create(*args_)); |
| EXTENSION_FUNCTION_VALIDATE(params.get()); |
| - MediaGalleries::GetMediaFileSystemsInteractivity interactive = "no"; |
| - if (params->details.get() && params->details->interactive.get()) |
| - interactive = *params->details->interactive; |
| + MediaGalleries::GetMediaFileSystemsInteractivity interactive = |
| + MediaGalleries::GETMEDIAFILESYSTEMSINTERACTIVITY_NO; |
|
not at google - send to devlin
2012/09/14 01:44:51
wow... what happened here? something funky with th
cduvall
2012/09/17 22:07:46
Done.
|
| + if (params->details.get() && params->details->interactive != |
| + MediaGalleries::GETMEDIAFILESYSTEMSINTERACTIVITY_NONE) { |
| + interactive = params->details->interactive; |
| + } |
|
not at google - send to devlin
2012/09/14 01:44:51
also this can use switch now that it's an enum.
cduvall
2012/09/17 22:07:46
Done.
|
| - if (interactive == "yes") { |
| + if (interactive == MediaGalleries::GETMEDIAFILESYSTEMSINTERACTIVITY_YES) { |
| ShowDialog(); |
| return true; |
| - } else if (interactive == "if_needed") { |
| + } else if (interactive == |
| + MediaGalleries::GETMEDIAFILESYSTEMSINTERACTIVITY_IF_NEEDED) { |
| std::vector<MediaFileSystemRegistry::MediaFSInfo> filesystems = |
| MediaFileSystemRegistry::GetInstance()->GetMediaFileSystemsForExtension( |
| render_view_host(), GetExtension()); |
| @@ -87,7 +91,8 @@ bool MediaGalleriesGetMediaFileSystemsFunction::RunImpl() { |
| ReturnGalleries(filesystems); |
| return true; |
| - } else if (interactive == "no") { |
| + } else if (interactive == |
| + MediaGalleries::GETMEDIAFILESYSTEMSINTERACTIVITY_NO) { |
| GetAndReturnGalleries(); |
| return true; |
| } |