| Index: trunk/src/components/dom_distiller/content/distiller_page_web_contents.h
|
| ===================================================================
|
| --- trunk/src/components/dom_distiller/content/distiller_page_web_contents.h (revision 272703)
|
| +++ trunk/src/components/dom_distiller/content/distiller_page_web_contents.h (working copy)
|
| @@ -21,19 +21,8 @@
|
|
|
| namespace dom_distiller {
|
|
|
| -class SourcePageHandleWebContents : public SourcePageHandle {
|
| - public:
|
| - explicit SourcePageHandleWebContents(
|
| - scoped_ptr<content::WebContents> web_contents);
|
| - virtual ~SourcePageHandleWebContents();
|
| +class DistillerContext;
|
|
|
| - scoped_ptr<content::WebContents> GetWebContents();
|
| -
|
| - private:
|
| - // The WebContents this class owns.
|
| - scoped_ptr<content::WebContents> web_contents_;
|
| -};
|
| -
|
| class DistillerPageWebContentsFactory : public DistillerPageFactory {
|
| public:
|
| explicit DistillerPageWebContentsFactory(
|
| @@ -42,8 +31,6 @@
|
| virtual ~DistillerPageWebContentsFactory() {}
|
|
|
| virtual scoped_ptr<DistillerPage> CreateDistillerPage() const OVERRIDE;
|
| - virtual scoped_ptr<DistillerPage> CreateDistillerPageWithHandle(
|
| - scoped_ptr<SourcePageHandle> handle) const OVERRIDE;
|
|
|
| private:
|
| content::BrowserContext* browser_context_;
|
| @@ -52,9 +39,7 @@
|
| class DistillerPageWebContents : public DistillerPage,
|
| public content::WebContentsObserver {
|
| public:
|
| - DistillerPageWebContents(
|
| - content::BrowserContext* browser_context,
|
| - scoped_ptr<SourcePageHandleWebContents> optional_web_contents_handle);
|
| + DistillerPageWebContents(content::BrowserContext* browser_context);
|
| virtual ~DistillerPageWebContents();
|
|
|
| // content::WebContentsObserver implementation.
|
| @@ -73,8 +58,6 @@
|
| const std::string& script) OVERRIDE;
|
|
|
| private:
|
| - friend class TestDistillerPageWebContents;
|
| -
|
| enum State {
|
| // The page distiller is idle.
|
| IDLE,
|
| @@ -87,10 +70,6 @@
|
| EXECUTING_JAVASCRIPT
|
| };
|
|
|
| - // Creates a new WebContents, adds |this| as an observer, and loads the
|
| - // |url|.
|
| - virtual void CreateNewWebContents(const GURL& url);
|
| -
|
| // Injects and executes JavaScript in the context of a loaded page. This
|
| // must only be called after the page has successfully loaded.
|
| void ExecuteJavaScript();
|
|
|