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..ca450ee7543aa09ba410a499c36e090d86ab1bed 100644 |
--- a/components/dom_distiller/ios/distiller_page_ios.h |
+++ b/components/dom_distiller/ios/distiller_page_ios.h |
@@ -13,12 +13,8 @@ |
#include "ios/web/public/web_state/web_state_observer.h" |
#include "url/gurl.h" |
-namespace ios { |
-class WebControllerProvider; |
-} |
- |
namespace web { |
-class BrowserState; |
+class WebState; |
} |
namespace dom_distiller { |
@@ -29,8 +25,9 @@ class DistillerWebStateObserver; |
// content. |
class DistillerPageIOS : public DistillerPage { |
Olivier
2016/12/08 18:28:02
May be you can implement FaviconDriverObserver her
gambard
2016/12/12 15:04:26
Acknowledged.
|
public: |
- explicit DistillerPageIOS(web::BrowserState* browser_state); |
+ explicit DistillerPageIOS(web::WebState* web_state); |
~DistillerPageIOS() override; |
+ void test(const base::Value*); |
Eugene But (OOO till 7-30)
2016/12/08 15:34:53
I guess this was added for testing or something.
gambard
2016/12/12 15:04:26
Done.
|
protected: |
bool StringifyOutput() override; |
@@ -48,10 +45,9 @@ 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_; |
std::unique_ptr<DistillerWebStateObserver> web_state_observer_; |
base::WeakPtrFactory<DistillerPageIOS> weak_ptr_factory_; |
}; |