Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3157)

Unified Diff: chrome/test/chromedriver/chrome/navigation_tracker.h

Issue 2125123002: [chromedriver] Add page loading strategy to capabilities (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed unittests, renamed py tests Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..f6bac2c9edd81cf415edfdbaf7b750e00cde9ca7 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_load_strategy.h"
#include "chrome/test/chromedriver/chrome/status.h"
namespace base {
@@ -25,14 +26,9 @@ class Status;
class Timeout;
// Tracks the navigation state of the page.
-class NavigationTracker : public DevToolsEventListener {
+class NavigationTracker : public DevToolsEventListener,
+ public PageLoadStrategy {
public:
- enum LoadingState {
- kUnknown,
- kLoading,
- kNotLoading,
- };
-
NavigationTracker(DevToolsClient* client,
const BrowserInfo* browser_info,
const JavaScriptDialogManager* dialog_manager);
@@ -44,16 +40,16 @@ class NavigationTracker : public DevToolsEventListener {
~NavigationTracker() override;
+ // Overriden from PageLoadStrategy:
// 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,

Powered by Google App Engine
This is Rietveld 408576698