OLD | NEW |
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 #include "chrome/test/chromedriver/session.h" | 5 #include "chrome/test/chromedriver/session.h" |
6 | 6 |
7 #include <list> | 7 #include <list> |
8 | 8 |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/test/chromedriver/chrome/chrome.h" | 10 #include "chrome/test/chromedriver/chrome/chrome.h" |
| 11 #include "chrome/test/chromedriver/chrome/devtools_event_logger.h" |
11 #include "chrome/test/chromedriver/chrome/status.h" | 12 #include "chrome/test/chromedriver/chrome/status.h" |
12 #include "chrome/test/chromedriver/chrome/version.h" | 13 #include "chrome/test/chromedriver/chrome/version.h" |
13 #include "chrome/test/chromedriver/chrome/web_view.h" | 14 #include "chrome/test/chromedriver/chrome/web_view.h" |
14 | 15 |
15 FrameInfo::FrameInfo(const std::string& parent_frame_id, | 16 FrameInfo::FrameInfo(const std::string& parent_frame_id, |
16 const std::string& frame_id, | 17 const std::string& frame_id, |
17 const std::string& chromedriver_frame_id) | 18 const std::string& chromedriver_frame_id) |
18 : parent_frame_id(parent_frame_id), | 19 : parent_frame_id(parent_frame_id), |
19 frame_id(frame_id), | 20 frame_id(frame_id), |
20 chromedriver_frame_id(chromedriver_frame_id) {} | 21 chromedriver_frame_id(chromedriver_frame_id) {} |
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 Session* SessionAccessorImpl::Access(scoped_ptr<base::AutoLock>* lock) { | 99 Session* SessionAccessorImpl::Access(scoped_ptr<base::AutoLock>* lock) { |
99 lock->reset(new base::AutoLock(session_lock_)); | 100 lock->reset(new base::AutoLock(session_lock_)); |
100 return session_.get(); | 101 return session_.get(); |
101 } | 102 } |
102 | 103 |
103 void SessionAccessorImpl::DeleteSession() { | 104 void SessionAccessorImpl::DeleteSession() { |
104 session_.reset(); | 105 session_.reset(); |
105 } | 106 } |
106 | 107 |
107 SessionAccessorImpl::~SessionAccessorImpl() {} | 108 SessionAccessorImpl::~SessionAccessorImpl() {} |
OLD | NEW |