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

Side by Side Diff: chrome/test/chromedriver/session.h

Issue 23542005: [chromedriver] Improve timeout behavior. Prompted by user who executes script on busy page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 7 years, 3 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROME_TEST_CHROMEDRIVER_SESSION_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_SESSION_H_
6 #define CHROME_TEST_CHROMEDRIVER_SESSION_H_ 6 #define CHROME_TEST_CHROMEDRIVER_SESSION_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 18 matching lines...) Expand all
29 FrameInfo(const std::string& parent_frame_id, 29 FrameInfo(const std::string& parent_frame_id,
30 const std::string& frame_id, 30 const std::string& frame_id,
31 const std::string& chromedriver_frame_id); 31 const std::string& chromedriver_frame_id);
32 32
33 std::string parent_frame_id; 33 std::string parent_frame_id;
34 std::string frame_id; 34 std::string frame_id;
35 std::string chromedriver_frame_id; 35 std::string chromedriver_frame_id;
36 }; 36 };
37 37
38 struct Session { 38 struct Session {
39 static const int kDefaultPageLoadTimeoutMs; 39 static const base::TimeDelta kDefaultPageLoadTimeout;
40 40
41 explicit Session(const std::string& id); 41 explicit Session(const std::string& id);
42 Session(const std::string& id, scoped_ptr<Chrome> chrome); 42 Session(const std::string& id, scoped_ptr<Chrome> chrome);
43 ~Session(); 43 ~Session();
44 44
45 Status GetTargetWindow(WebView** web_view); 45 Status GetTargetWindow(WebView** web_view);
46 46
47 void SwitchToTopFrame(); 47 void SwitchToTopFrame();
48 void SwitchToSubFrame(const std::string& frame_id, 48 void SwitchToSubFrame(const std::string& frame_id,
49 const std::string& chromedriver_frame_id); 49 const std::string& chromedriver_frame_id);
(...skipping 18 matching lines...) Expand all
68 // Logs that populate from DevTools events. 68 // Logs that populate from DevTools events.
69 ScopedVector<WebDriverLog> devtools_logs; 69 ScopedVector<WebDriverLog> devtools_logs;
70 base::ScopedTempDir temp_dir; 70 base::ScopedTempDir temp_dir;
71 const scoped_ptr<base::DictionaryValue> capabilities; 71 const scoped_ptr<base::DictionaryValue> capabilities;
72 72
73 private: 73 private:
74 scoped_ptr<base::DictionaryValue> CreateCapabilities(); 74 scoped_ptr<base::DictionaryValue> CreateCapabilities();
75 }; 75 };
76 76
77 #endif // CHROME_TEST_CHROMEDRIVER_SESSION_H_ 77 #endif // CHROME_TEST_CHROMEDRIVER_SESSION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698