A few minor changes to the chrome.downloads extension API

chrome/browser/extensions/api/downloads/downloads_api.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_DOWNLOADS_DOWNLOADS_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_DOWNLOADS_DOWNLOADS_API_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string16.h"
 #include "base/values.h"
 #include "chrome/browser/download/all_download_item_notifier.h"
+#include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/download/download_path_reservation_tracker.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/common/extensions/api/downloads.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 
 class DownloadFileIconExtractor;
 class DownloadQuery;
 
 namespace content {
 class ResourceContext;
 class ResourceDispatcherHost;
 }
 
 // Functions in the chrome.downloads namespace facilitate
 // controlling downloads from extensions. See the full API doc at
 // http://goo.gl/6hO1n
 
 namespace download_extension_errors {
 
 // Errors that can be returned through chrome.runtime.lastError.message.
-extern const char kGenericError[];
-extern const char kIconNotFoundError[];
-extern const char kInvalidDangerTypeError[];
-extern const char kInvalidFilenameError[];
-extern const char kInvalidFilterError[];
-extern const char kInvalidOperationError[];
-extern const char kInvalidOrderByError[];
+extern const char kEmptyFile[];
+extern const char kFileAlreadyDeleted[];
+extern const char kIconNotFound[];
+extern const char kInvalidDangerType[];
+extern const char kInvalidFilename[];
+extern const char kInvalidFilter[];
+extern const char kInvalidHeader[];
+extern const char kInvalidId[];
+extern const char kInvalidOrderBy[];
 extern const char kInvalidQueryLimit[];
-extern const char kInvalidStateError[];
-extern const char kInvalidURLError[];
-extern const char kNotImplementedError[];
-extern const char kTooManyListenersError[];
+extern const char kInvalidState[];
+extern const char kInvalidURL[];
+extern const char kInvisibleContext[];
+extern const char kNotComplete[];
+extern const char kNotDangerous[];
+extern const char kNotImplemented[];
+extern const char kNotInProgress[];
+extern const char kNotPermittedURL[];
+extern const char kOpenPermission[];
+extern const char kTooManyListeners[];
+extern const char kUnexpectedDeterminer[];
 
 }  // namespace download_extension_errors
 
 
 class DownloadsDownloadFunction : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("downloads.download", DOWNLOADS_DOWNLOAD)
   DownloadsDownloadFunction();
   virtual bool RunImpl() OVERRIDE;
 
  protected:
   virtual ~DownloadsDownloadFunction();
 
  private:
-  void OnStarted(content::DownloadItem* item, net::Error error);
+  void OnStarted(
+      const base::FilePath& creator_suggested_filename,
+      extensions::api::downloads::FilenameConflictAction
+        creator_conflict_action,
+      content::DownloadItem* item,
+      net::Error error);
 
   DISALLOW_COPY_AND_ASSIGN(DownloadsDownloadFunction);
 };
 
 class DownloadsSearchFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("downloads.search", DOWNLOADS_SEARCH)
   DownloadsSearchFunction();
   virtual bool RunImpl() OVERRIDE;
 
@@ skipping 49 matching lines @@
   DownloadsEraseFunction();
   virtual bool RunImpl() OVERRIDE;
 
  protected:
   virtual ~DownloadsEraseFunction();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DownloadsEraseFunction);
 };
 
+class DownloadsRemoveFileFunction : public AsyncExtensionFunction,
+                                    public content::DownloadItem::Observer {
+ public:
+  DECLARE_EXTENSION_FUNCTION("downloads.removeFile", DOWNLOADS_REMOVEFILE)
+  DownloadsRemoveFileFunction();
+  virtual bool RunImpl() OVERRIDE;
+
+ protected:
+  virtual ~DownloadsRemoveFileFunction();
+
+ private:
+  virtual void OnDownloadUpdated(content::DownloadItem* item) OVERRIDE;
+  virtual void OnDownloadDestroyed(content::DownloadItem* item) OVERRIDE;
+
+  content::DownloadItem* item_;
+
+  DISALLOW_COPY_AND_ASSIGN(DownloadsRemoveFileFunction);
+};
+
 class DownloadsAcceptDangerFunction : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER)
   DownloadsAcceptDangerFunction();
   virtual bool RunImpl() OVERRIDE;
 
  protected:
   virtual ~DownloadsAcceptDangerFunction();
-  void DangerPromptCallback(bool accept, int download_id);
+  void DangerPromptCallback(int download_id,
+                            DownloadDangerPrompt::Action action);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DownloadsAcceptDangerFunction);
 };
 
 class DownloadsShowFunction : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("downloads.show", DOWNLOADS_SHOW)
   DownloadsShowFunction();
   virtual bool RunImpl() OVERRIDE;
 
  protected:
   virtual ~DownloadsShowFunction();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DownloadsShowFunction);
 };
 
+class DownloadsShowDefaultFolderFunction : public AsyncExtensionFunction {
+ public:
+  DECLARE_EXTENSION_FUNCTION(
+      "downloads.showDefaultFolder", DOWNLOADS_SHOWDEFAULTFOLDER)
+  DownloadsShowDefaultFolderFunction();
+  virtual bool RunImpl() OVERRIDE;
+
+ protected:
+  virtual ~DownloadsShowDefaultFolderFunction();
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(DownloadsShowDefaultFolderFunction);
+};
+
 class DownloadsOpenFunction : public SyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("downloads.open", DOWNLOADS_OPEN)
   DownloadsOpenFunction();
   virtual bool RunImpl() OVERRIDE;
 
  protected:
   virtual ~DownloadsOpenFunction();
 
  private:
@@ skipping 100 matching lines @@
       const extensions::Event::WillDispatchCallback& will_dispatch_callback,
       base::Value* json_arg);
 
   Profile* profile_;
   AllDownloadItemNotifier notifier_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionDownloadsEventRouter);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_DOWNLOADS_DOWNLOADS_API_H_