| Index: chrome/test/chromedriver/chrome/navigation_tracker.h
|
| diff --git a/chrome/test/chromedriver/chrome/navigation_tracker.h b/chrome/test/chromedriver/chrome/navigation_tracker.h
|
| index 663a3cd33ef587a3d8008fd9fbe08a1662ea21b6..ee3ae03a30d8427a7ebafbcdbe4ff2435570dc86 100644
|
| --- a/chrome/test/chromedriver/chrome/navigation_tracker.h
|
| +++ b/chrome/test/chromedriver/chrome/navigation_tracker.h
|
| @@ -12,6 +12,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "chrome/test/chromedriver/chrome/devtools_event_listener.h"
|
| +#include "chrome/test/chromedriver/chrome/page_loading_strategy.h"
|
| #include "chrome/test/chromedriver/chrome/status.h"
|
|
|
| namespace base {
|
| @@ -25,13 +26,9 @@ class Status;
|
| class Timeout;
|
|
|
| // Tracks the navigation state of the page.
|
| -class NavigationTracker : public DevToolsEventListener {
|
| +class NavigationTracker : public DevToolsEventListener,
|
| + public PageLoadingStrategy {
|
| public:
|
| - enum LoadingState {
|
| - kUnknown,
|
| - kLoading,
|
| - kNotLoading,
|
| - };
|
|
|
| NavigationTracker(DevToolsClient* client,
|
| const BrowserInfo* browser_info,
|
| @@ -44,16 +41,16 @@ class NavigationTracker : public DevToolsEventListener {
|
|
|
| ~NavigationTracker() override;
|
|
|
| + // Overriden from PageLoadingStrategy:
|
| // Gets whether a navigation is pending for the specified frame. |frame_id|
|
| // may be empty to signify the main frame.
|
| Status IsPendingNavigation(const std::string& frame_id,
|
| const Timeout* timeout,
|
| - bool* is_pending);
|
| + bool* is_pending) override;
|
| + void set_timed_out(bool timed_out) override;
|
|
|
| Status CheckFunctionExists(const Timeout* timeout, bool* exists);
|
|
|
| - void set_timed_out(bool timed_out);
|
| -
|
| // Overridden from DevToolsEventListener:
|
| Status OnConnected(DevToolsClient* client) override;
|
| Status OnEvent(DevToolsClient* client,
|
|
|