| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_WEBDRIVER_SESSION_H_ | 5 #ifndef CHROME_TEST_WEBDRIVER_SESSION_H_ |
| 6 #define CHROME_TEST_WEBDRIVER_SESSION_H_ | 6 #define CHROME_TEST_WEBDRIVER_SESSION_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/file_path.h" | 12 #include "base/file_path.h" |
| 13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 14 #include "base/string16.h" | 14 #include "base/string16.h" |
| 15 #include "base/threading/thread.h" | 15 #include "base/threading/thread.h" |
| 16 #include "chrome/common/automation_constants.h" | 16 #include "chrome/common/automation_constants.h" |
| 17 #include "chrome/test/webdriver/automation.h" | 17 #include "chrome/test/webdriver/automation.h" |
| 18 #include "chrome/test/webdriver/frame_path.h" | 18 #include "chrome/test/webdriver/frame_path.h" |
| 19 #include "chrome/test/webdriver/web_element_id.h" | 19 #include "chrome/test/webdriver/web_element_id.h" |
| 20 #include "ui/gfx/point.h" | 20 #include "ui/gfx/point.h" |
| 21 | 21 |
| 22 class CommandLine; | 22 class CommandLine; |
| 23 class DictionaryValue; | |
| 24 class FilePath; | 23 class FilePath; |
| 25 class GURL; | 24 class GURL; |
| 25 |
| 26 namespace base { |
| 27 class DictionaryValue; |
| 26 class ListValue; | 28 class ListValue; |
| 27 class Value; | 29 class Value; |
| 28 | |
| 29 namespace base { | |
| 30 class WaitableEvent; | 30 class WaitableEvent; |
| 31 } | 31 } |
| 32 | 32 |
| 33 namespace gfx { | 33 namespace gfx { |
| 34 class Rect; | 34 class Rect; |
| 35 class Size; | 35 class Size; |
| 36 } | 36 } |
| 37 | 37 |
| 38 using base::DictionaryValue; |
| 39 using base::ListValue; |
| 40 using base::Value; |
| 41 |
| 38 namespace webdriver { | 42 namespace webdriver { |
| 39 | 43 |
| 40 class Error; | 44 class Error; |
| 41 | 45 |
| 42 // A window ID and frame path combination that uniquely identifies a specific | 46 // A window ID and frame path combination that uniquely identifies a specific |
| 43 // frame within a session. | 47 // frame within a session. |
| 44 struct FrameId { | 48 struct FrameId { |
| 45 FrameId(int window_id, const FramePath& frame_path); | 49 FrameId(int window_id, const FramePath& frame_path); |
| 46 FrameId& operator=(const FrameId& other); | 50 FrameId& operator=(const FrameId& other); |
| 47 int window_id; | 51 int window_id; |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 363 bool has_alert_prompt_text_; | 367 bool has_alert_prompt_text_; |
| 364 | 368 |
| 365 DISALLOW_COPY_AND_ASSIGN(Session); | 369 DISALLOW_COPY_AND_ASSIGN(Session); |
| 366 }; | 370 }; |
| 367 | 371 |
| 368 } // namespace webdriver | 372 } // namespace webdriver |
| 369 | 373 |
| 370 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Session); | 374 DISABLE_RUNNABLE_METHOD_REFCOUNT(webdriver::Session); |
| 371 | 375 |
| 372 #endif // CHROME_TEST_WEBDRIVER_SESSION_H_ | 376 #endif // CHROME_TEST_WEBDRIVER_SESSION_H_ |
| OLD | NEW |