| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ | 5 #ifndef CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ |
| 6 #define CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ | 6 #define CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <set> | 9 #include <set> |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 void Wait(); | 36 void Wait(); |
| 37 | 37 |
| 38 // Runs a nested message loop and blocks until the navigation in the | 38 // Runs a nested message loop and blocks until the navigation in the |
| 39 // associated FrameTreeNode has committed. | 39 // associated FrameTreeNode has committed. |
| 40 void WaitForCommit(); | 40 void WaitForCommit(); |
| 41 | 41 |
| 42 private: | 42 private: |
| 43 // WebContentsObserver | 43 // WebContentsObserver |
| 44 void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host, | 44 void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host, |
| 45 const GURL& validated_url, | 45 const GURL& validated_url, |
| 46 bool is_error_page, | 46 bool is_error_page) override; |
| 47 bool is_iframe_srcdoc) override; | |
| 48 void DidCommitProvisionalLoadForFrame( | 47 void DidCommitProvisionalLoadForFrame( |
| 49 RenderFrameHost* render_frame_host, | 48 RenderFrameHost* render_frame_host, |
| 50 const GURL& url, | 49 const GURL& url, |
| 51 ui::PageTransition transition_type) override; | 50 ui::PageTransition transition_type) override; |
| 52 void DidStopLoading() override; | 51 void DidStopLoading() override; |
| 53 | 52 |
| 54 // The id of the FrameTreeNode in which navigations are peformed. | 53 // The id of the FrameTreeNode in which navigations are peformed. |
| 55 int frame_tree_node_id_; | 54 int frame_tree_node_id_; |
| 56 | 55 |
| 57 // If true the navigation has started. | 56 // If true the navigation has started. |
| 58 bool navigation_started_; | 57 bool navigation_started_; |
| 59 | 58 |
| 60 // If true, the navigation has committed. | 59 // If true, the navigation has committed. |
| 61 bool has_committed_; | 60 bool has_committed_; |
| 62 | 61 |
| 63 // If true, this object is waiting for commit only, not for the full load | 62 // If true, this object is waiting for commit only, not for the full load |
| 64 // of the document. | 63 // of the document. |
| 65 bool wait_for_commit_; | 64 bool wait_for_commit_; |
| 66 | 65 |
| 67 // The MessageLoopRunner used to spin the message loop. | 66 // The MessageLoopRunner used to spin the message loop. |
| 68 scoped_refptr<MessageLoopRunner> message_loop_runner_; | 67 scoped_refptr<MessageLoopRunner> message_loop_runner_; |
| 69 | 68 |
| 70 DISALLOW_COPY_AND_ASSIGN(TestFrameNavigationObserver); | 69 DISALLOW_COPY_AND_ASSIGN(TestFrameNavigationObserver); |
| 71 }; | 70 }; |
| 72 | 71 |
| 73 } // namespace content | 72 } // namespace content |
| 74 | 73 |
| 75 #endif // CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ | 74 #endif // CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ |
| OLD | NEW |