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

Side by Side Diff: chrome/test/webdriver/webdriver_session.h

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
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_WEBDRIVER_WEBDRIVER_SESSION_H_ 5 #ifndef CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_
6 #define CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ 6 #define CHROME_TEST_WEBDRIVER_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/callback_forward.h" 12 #include "base/callback_forward.h"
13 #include "base/file_path.h" 13 #include "base/file_path.h"
14 #include "base/files/scoped_temp_dir.h"
14 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
15 #include "base/scoped_temp_dir.h"
16 #include "base/string16.h" 16 #include "base/string16.h"
17 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
18 #include "chrome/common/automation_constants.h" 18 #include "chrome/common/automation_constants.h"
19 #include "chrome/test/automation/automation_json_requests.h" 19 #include "chrome/test/automation/automation_json_requests.h"
20 #include "chrome/test/webdriver/frame_path.h" 20 #include "chrome/test/webdriver/frame_path.h"
21 #include "chrome/test/webdriver/webdriver_automation.h" 21 #include "chrome/test/webdriver/webdriver_automation.h"
22 #include "chrome/test/webdriver/webdriver_basic_types.h" 22 #include "chrome/test/webdriver/webdriver_basic_types.h"
23 #include "chrome/test/webdriver/webdriver_capabilities_parser.h" 23 #include "chrome/test/webdriver/webdriver_capabilities_parser.h"
24 #include "chrome/test/webdriver/webdriver_element_id.h" 24 #include "chrome/test/webdriver/webdriver_element_id.h"
25 #include "chrome/test/webdriver/webdriver_logging.h" 25 #include "chrome/test/webdriver/webdriver_logging.h"
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 477
478 // Chrome does not have an individual method for setting the prompt text 478 // Chrome does not have an individual method for setting the prompt text
479 // of an alert. Instead, when the WebDriver client wants to set the text, 479 // of an alert. Instead, when the WebDriver client wants to set the text,
480 // we store it here and pass the text when the alert is accepted or 480 // we store it here and pass the text when the alert is accepted or
481 // dismissed. This text should only be used if |has_alert_prompt_text_| 481 // dismissed. This text should only be used if |has_alert_prompt_text_|
482 // is true, so that the default prompt text is not overridden. 482 // is true, so that the default prompt text is not overridden.
483 std::string alert_prompt_text_; 483 std::string alert_prompt_text_;
484 bool has_alert_prompt_text_; 484 bool has_alert_prompt_text_;
485 485
486 // Temporary directory containing session data. 486 // Temporary directory containing session data.
487 ScopedTempDir temp_dir_; 487 base::ScopedTempDir temp_dir_;
488 Capabilities capabilities_; 488 Capabilities capabilities_;
489 489
490 // Current state of all modifier keys. 490 // Current state of all modifier keys.
491 int sticky_modifiers_; 491 int sticky_modifiers_;
492 492
493 // Chrome's build number. This is the 3rd number in Chrome's version string 493 // Chrome's build number. This is the 3rd number in Chrome's version string
494 // (e.g., 18.0.995.0 -> 995). Only valid after Chrome has started. 494 // (e.g., 18.0.995.0 -> 995). Only valid after Chrome has started.
495 // See http://dev.chromium.org/releases/version-numbers. 495 // See http://dev.chromium.org/releases/version-numbers.
496 int build_no_; 496 int build_no_;
497 497
498 DISALLOW_COPY_AND_ASSIGN(Session); 498 DISALLOW_COPY_AND_ASSIGN(Session);
499 }; 499 };
500 500
501 } // namespace webdriver 501 } // namespace webdriver
502 502
503 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_ 503 #endif // CHROME_TEST_WEBDRIVER_WEBDRIVER_SESSION_H_
OLDNEW
« no previous file with comments | « chrome/test/webdriver/webdriver_capabilities_parser_unittest.cc ('k') | chrome/test/webdriver/webdriver_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698