Chromium Code Reviews| Index: third_party/WebKit/Source/modules/installedapp/InstalledAppController.h |
| diff --git a/third_party/WebKit/Source/modules/installedapp/InstalledAppController.h b/third_party/WebKit/Source/modules/installedapp/InstalledAppController.h |
| index ba73fc4917527fb0c66ea84f6ba6d6a99a2ee467..b6924f1e7332e0f8af4745bf2496803e844985ff 100644 |
| --- a/third_party/WebKit/Source/modules/installedapp/InstalledAppController.h |
| +++ b/third_party/WebKit/Source/modules/installedapp/InstalledAppController.h |
| @@ -12,6 +12,8 @@ |
| #include "public/platform/WebVector.h" |
| #include "public/platform/modules/installedapp/WebRelatedApplication.h" |
| #include "public/platform/modules/installedapp/WebRelatedAppsFetcher.h" |
| +#include "public/platform/modules/installedapp/installed_app_provider.mojom-blink.h" |
| +#include "public/platform/modules/installedapp/related_application.mojom-blink.h" |
| #include "wtf/RefPtr.h" |
| #include "wtf/Vector.h" |
| @@ -19,8 +21,6 @@ |
| namespace blink { |
| -class SecurityOrigin; |
| - |
| class MODULES_EXPORT InstalledAppController final |
| : public GarbageCollectedFinalized<InstalledAppController>, |
| public Supplement<LocalFrame>, |
| @@ -31,10 +31,9 @@ class MODULES_EXPORT InstalledAppController final |
| public: |
| virtual ~InstalledAppController(); |
| - // Gets a list of related apps from a particular origin's manifest that belong |
| + // Gets a list of related apps from the current page's manifest that belong |
| // to the current underlying platform, and are installed. |
| - void getInstalledRelatedApps(WTF::RefPtr<SecurityOrigin>, |
| - std::unique_ptr<AppInstalledCallbacks>); |
| + void getInstalledRelatedApps(std::unique_ptr<AppInstalledCallbacks>); |
| static void provideTo(LocalFrame&, WebRelatedAppsFetcher*); |
| static InstalledAppController* from(LocalFrame&); |
| @@ -50,13 +49,19 @@ class MODULES_EXPORT InstalledAppController final |
| // Inherited from ContextLifecycleObserver. |
| void contextDestroyed(ExecutionContext*) override; |
| - // For a given security origin, takes a set of related applications and |
| - // filters them by those which belong to the current underlying platform, and |
| - // are actually installed. Passes the filtered list to the callback. |
| - void filterByInstalledApps(WTF::RefPtr<SecurityOrigin>, |
| - const WebVector<WebRelatedApplication>&, |
| + // Takes a set of related applications and filters them by those which belong |
| + // to the current underlying platform, and are actually installed and related |
| + // to the current page's origin. Passes the filtered list to the callback. |
| + void filterByInstalledApps(const WebVector<WebRelatedApplication>&, |
| std::unique_ptr<AppInstalledCallbacks>); |
| + // Callback from the InstalledAppProvider mojo service. |
| + void OnFilterInstalledApps(std::unique_ptr<blink::AppInstalledCallbacks>, |
| + WTF::Vector<mojom::blink::RelatedApplicationPtr>); |
| + |
| + // Handle to the InstalledApp mojo service. |
| + mojom::blink::InstalledAppProviderPtr m_provider = nullptr; |
|
dcheng
2017/03/13 06:16:51
Aside: = nullptr is unnecessary here (this is the
Matt Giuca
2017/03/14 06:38:11
Done.
|
| + |
| WebRelatedAppsFetcher* m_relatedAppsFetcher; |
| }; |