Move web_app::AppId and web_app::ManifestId to a more public place
So that Android and Desktop implementations can share the types.
Note that this is part of a multi-CL change. This CL only touches
references in /chrome/browser/download.
BUG=1486624
This CL was uploaded by git cl split.
[email protected]
Change-Id: I3b0d82dc85a9fbc5a146fb420c4cd9839df3a78c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4884741
Commit-Queue: Glenn Hartmann <[email protected]>
Reviewed-by: Min Qin <[email protected]>
Auto-Submit: Glenn Hartmann <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1201676}
diff --git a/chrome/browser/download/download_item_web_app_data.h b/chrome/browser/download/download_item_web_app_data.h
index b324b4d..eb2196e7 100644
--- a/chrome/browser/download/download_item_web_app_data.h
+++ b/chrome/browser/download/download_item_web_app_data.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_WEB_APP_DATA_H_
#include "base/supports_user_data.h"
-#include "chrome/browser/web_applications/web_app_id.h"
+#include "components/webapps/common/web_app_id.h"
namespace download {
class DownloadItem;
@@ -19,7 +19,7 @@
// Creates an instance with the given `web_app_id` and attaches it to the
// item. Overwrites any existing DownloadItemWebAppData on the item.
static void CreateAndAttachToItem(download::DownloadItem* item,
- const web_app::AppId& web_app_id);
+ const webapps::AppId& web_app_id);
// Returns nullptr if no DownloadItemWebAppData is present, which will be the
// case for most downloads (i.e. those not initiated by web apps).
@@ -28,14 +28,14 @@
DownloadItemWebAppData(const DownloadItemWebAppData&) = delete;
DownloadItemWebAppData& operator=(const DownloadItemWebAppData&) = delete;
- const web_app::AppId& id() const { return web_app_id_; }
+ const webapps::AppId& id() const { return web_app_id_; }
private:
static const char kKey[];
- explicit DownloadItemWebAppData(const web_app::AppId& web_app_id);
+ explicit DownloadItemWebAppData(const webapps::AppId& web_app_id);
- web_app::AppId web_app_id_;
+ webapps::AppId web_app_id_;
};
#endif // __CHROMIUM_SRC_CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_WEB_APP_DATA_H_
