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

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

Issue 14263024: Logging API in chromedriver2. (Closed) Base URL: https://src.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 8 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
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/memory/scoped_vector.h"
14 #include "base/synchronization/lock.h" 15 #include "base/synchronization/lock.h"
15 #include "base/threading/thread.h" 16 #include "base/threading/thread.h"
16 #include "chrome/test/chromedriver/basic_types.h" 17 #include "chrome/test/chromedriver/basic_types.h"
17 #include "chrome/test/chromedriver/chrome/geoposition.h" 18 #include "chrome/test/chromedriver/chrome/geoposition.h"
18 19
19 namespace base { 20 namespace base {
20 class DictionaryValue; 21 class DictionaryValue;
21 } 22 }
22 23
23 class Chrome; 24 class Chrome;
25 class DevToolsEventLogger;
24 class Status; 26 class Status;
25 class WebView; 27 class WebView;
26 28
27 struct FrameInfo { 29 struct FrameInfo {
28 FrameInfo(const std::string& parent_frame_id, 30 FrameInfo(const std::string& parent_frame_id,
29 const std::string& frame_id, 31 const std::string& frame_id,
30 const std::string& chromedriver_frame_id); 32 const std::string& chromedriver_frame_id);
31 33
32 std::string parent_frame_id; 34 std::string parent_frame_id;
33 std::string frame_id; 35 std::string frame_id;
(...skipping 20 matching lines...) Expand all
54 // List of |FrameInfo|s for each frame to the current target frame from the 56 // List of |FrameInfo|s for each frame to the current target frame from the
55 // first frame element in the root document. If target frame is window.top, 57 // first frame element in the root document. If target frame is window.top,
56 // this list will be empty. 58 // this list will be empty.
57 std::list<FrameInfo> frames; 59 std::list<FrameInfo> frames;
58 WebPoint mouse_position; 60 WebPoint mouse_position;
59 int implicit_wait; 61 int implicit_wait;
60 int page_load_timeout; 62 int page_load_timeout;
61 int script_timeout; 63 int script_timeout;
62 std::string prompt_text; 64 std::string prompt_text;
63 scoped_ptr<Geoposition> overridden_geoposition; 65 scoped_ptr<Geoposition> overridden_geoposition;
66 ScopedVector<DevToolsEventLogger> devtools_event_loggers;
64 const scoped_ptr<base::DictionaryValue> capabilities; 67 const scoped_ptr<base::DictionaryValue> capabilities;
65 68
66 private: 69 private:
67 scoped_ptr<base::DictionaryValue> CreateCapabilities(); 70 scoped_ptr<base::DictionaryValue> CreateCapabilities();
68 }; 71 };
69 72
70 class SessionAccessor : public base::RefCountedThreadSafe<SessionAccessor> { 73 class SessionAccessor : public base::RefCountedThreadSafe<SessionAccessor> {
71 public: 74 public:
72 virtual Session* Access(scoped_ptr<base::AutoLock>* lock) = 0; 75 virtual Session* Access(scoped_ptr<base::AutoLock>* lock) = 0;
73 76
(...skipping 15 matching lines...) Expand all
89 private: 92 private:
90 virtual ~SessionAccessorImpl(); 93 virtual ~SessionAccessorImpl();
91 94
92 base::Lock session_lock_; 95 base::Lock session_lock_;
93 scoped_ptr<Session> session_; 96 scoped_ptr<Session> session_;
94 97
95 DISALLOW_COPY_AND_ASSIGN(SessionAccessorImpl); 98 DISALLOW_COPY_AND_ASSIGN(SessionAccessorImpl);
96 }; 99 };
97 100
98 #endif // CHROME_TEST_CHROMEDRIVER_SESSION_H_ 101 #endif // CHROME_TEST_CHROMEDRIVER_SESSION_H_
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/server/chromedriver_server.cc ('k') | chrome/test/chromedriver/session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698