| Index: components/dom_distiller/ios/distiller_page_ios.h
|
| diff --git a/components/dom_distiller/ios/distiller_page_ios.h b/components/dom_distiller/ios/distiller_page_ios.h
|
| index 9c799852b91e05c62ddb66aca1555eecaadd07e4..34d30ddd4ff0f693988372a358596452a5bbdbb5 100644
|
| --- a/components/dom_distiller/ios/distiller_page_ios.h
|
| +++ b/components/dom_distiller/ios/distiller_page_ios.h
|
| @@ -10,28 +10,23 @@
|
|
|
| #include "base/memory/weak_ptr.h"
|
| #include "components/dom_distiller/core/distiller_page.h"
|
| +#include "components/dom_distiller/ios/web_state_pool.h"
|
| #include "ios/web/public/web_state/web_state_observer.h"
|
| #include "url/gurl.h"
|
|
|
| -namespace ios {
|
| -class WebControllerProvider;
|
| -}
|
| -
|
| -namespace web {
|
| -class BrowserState;
|
| -}
|
| -
|
| namespace dom_distiller {
|
|
|
| class DistillerWebStateObserver;
|
|
|
| // Loads URLs and injects JavaScript into a page, extracting the distilled page
|
| // content.
|
| -class DistillerPageIOS : public DistillerPage {
|
| +class DistillerPageIOS : public DistillerPage, WebStatePoolDelegate {
|
| public:
|
| - explicit DistillerPageIOS(web::BrowserState* browser_state);
|
| + explicit DistillerPageIOS(WebStatePool* web_state_pool);
|
| ~DistillerPageIOS() override;
|
|
|
| + void OnWebStateAvailable(web::WebState* web_state) override;
|
| +
|
| protected:
|
| bool StringifyOutput() override;
|
| void DistillPageImpl(const GURL& url, const std::string& script) override;
|
| @@ -48,10 +43,10 @@ class DistillerPageIOS : public DistillerPage {
|
| // Converts result of WKWebView script evaluation to base::Value
|
| std::unique_ptr<base::Value> ValueResultFromScriptResult(id wk_result);
|
|
|
| - web::BrowserState* browser_state_;
|
| GURL url_;
|
| std::string script_;
|
| - std::unique_ptr<ios::WebControllerProvider> provider_;
|
| + web::WebState* web_state_;
|
| + WebStatePool* web_state_pool_;
|
| std::unique_ptr<DistillerWebStateObserver> web_state_observer_;
|
| base::WeakPtrFactory<DistillerPageIOS> weak_ptr_factory_;
|
| };
|
|
|