diff options
Diffstat (limited to 'chromium/chrome/browser/extensions/api/downloads_internal')
-rw-r--r-- | chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.cc | 16 | ||||
-rw-r--r-- | chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.cc b/chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.cc index 109d0b84a3e..db6580819bf 100644 --- a/chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.cc +++ b/chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.cc @@ -19,21 +19,21 @@ DownloadsInternalDetermineFilenameFunction:: typedef extensions::api::downloads_internal::DetermineFilename::Params DetermineFilenameParams; -bool DownloadsInternalDetermineFilenameFunction::RunAsync() { +ExtensionFunction::ResponseAction +DownloadsInternalDetermineFilenameFunction::Run() { std::unique_ptr<DetermineFilenameParams> params( DetermineFilenameParams::Create(*args_)); EXTENSION_FUNCTION_VALIDATE(params.get()); base::FilePath::StringType filename; EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &filename)); - return ExtensionDownloadsEventRouter::DetermineFilename( - GetProfile(), - include_incognito(), - extension()->id(), - params->download_id, - base::FilePath(filename), + std::string error; + bool result = ExtensionDownloadsEventRouter::DetermineFilename( + browser_context(), include_incognito(), extension()->id(), + params->download_id, base::FilePath(filename), extensions::api::downloads::ParseFilenameConflictAction( params->conflict_action), - &error_); + &error); + return RespondNow(result ? NoArguments() : Error(error)); } } // namespace extensions diff --git a/chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h b/chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h index f7da2b58564..4d6acf505cf 100644 --- a/chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h +++ b/chromium/chrome/browser/extensions/api/downloads_internal/downloads_internal_api.h @@ -6,17 +6,17 @@ #define CHROME_BROWSER_EXTENSIONS_API_DOWNLOADS_INTERNAL_DOWNLOADS_INTERNAL_API_H_ #include "base/macros.h" -#include "chrome/browser/extensions/chrome_extension_function.h" +#include "extensions/browser/extension_function.h" namespace extensions { class DownloadsInternalDetermineFilenameFunction - : public ChromeAsyncExtensionFunction { + : public UIThreadExtensionFunction { public: DECLARE_EXTENSION_FUNCTION("downloadsInternal.determineFilename", DOWNLOADSINTERNAL_DETERMINEFILENAME); DownloadsInternalDetermineFilenameFunction(); - bool RunAsync() override; + ResponseAction Run() override; protected: ~DownloadsInternalDetermineFilenameFunction() override; |