| Index: components/html_viewer/html_frame.h
|
| diff --git a/components/html_viewer/html_frame.h b/components/html_viewer/html_frame.h
|
| index 644160570d1e29395ce3d906541da0e02e5947e2..fef256ab44ae835801a49a7b377a8c7420bd7ba0 100644
|
| --- a/components/html_viewer/html_frame.h
|
| +++ b/components/html_viewer/html_frame.h
|
| @@ -147,6 +147,8 @@ class HTMLFrame : public blink::WebFrameClient,
|
| // Returns true if this or one of the frames descendants is local.
|
| bool HasLocalDescendant() const;
|
|
|
| + void LoadRequest(const blink::WebURLRequest& request);
|
| +
|
| protected:
|
| virtual ~HTMLFrame();
|
|
|
| @@ -167,6 +169,7 @@ class HTMLFrame : public blink::WebFrameClient,
|
| virtual blink::WebCookieJar* cookieJar(blink::WebLocalFrame* frame);
|
| virtual blink::WebNavigationPolicy decidePolicyForNavigation(
|
| const NavigationPolicyInfo& info);
|
| + virtual bool hasPendingNavigation(blink::WebLocalFrame* frame);
|
| virtual void didHandleOnloadEvents(blink::WebLocalFrame* frame);
|
| virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
|
| const blink::WebString& source_name,
|
| @@ -332,6 +335,10 @@ class HTMLFrame : public blink::WebFrameClient,
|
|
|
| scoped_ptr<DevToolsAgentImpl> devtools_agent_;
|
|
|
| + // A navigation request has been sent to the frame server side, and we haven't
|
| + // received response to it.
|
| + bool pending_navigation_;
|
| +
|
| base::WeakPtrFactory<HTMLFrame> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(HTMLFrame);
|
|
|