OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_CHROME_CHROME_DESKTOP_IMPL_H_ | 5 #ifndef CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ |
6 #define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ | 6 #define CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 Status GetAsDesktop(ChromeDesktopImpl** desktop) override; | 50 Status GetAsDesktop(ChromeDesktopImpl** desktop) override; |
51 std::string GetOperatingSystemName() override; | 51 std::string GetOperatingSystemName() override; |
52 | 52 |
53 // Overridden from ChromeImpl: | 53 // Overridden from ChromeImpl: |
54 bool IsMobileEmulationEnabled() const override; | 54 bool IsMobileEmulationEnabled() const override; |
55 bool HasTouchScreen() const override; | 55 bool HasTouchScreen() const override; |
56 Status QuitImpl() override; | 56 Status QuitImpl() override; |
57 | 57 |
58 const base::CommandLine& command() const; | 58 const base::CommandLine& command() const; |
59 | 59 |
| 60 Status WaitForNewAppWindow(const base::TimeDelta& timeout, |
| 61 const std::string& app_id, |
| 62 std::string* web_view_id); |
| 63 |
60 private: | 64 private: |
61 base::Process process_; | 65 base::Process process_; |
62 base::CommandLine command_; | 66 base::CommandLine command_; |
63 base::ScopedTempDir user_data_dir_; | 67 base::ScopedTempDir user_data_dir_; |
64 base::ScopedTempDir extension_dir_; | 68 base::ScopedTempDir extension_dir_; |
65 | 69 |
66 // Lazily initialized, may be null. | 70 // Lazily initialized, may be null. |
67 scoped_ptr<AutomationExtension> automation_extension_; | 71 scoped_ptr<AutomationExtension> automation_extension_; |
68 }; | 72 }; |
69 | 73 |
70 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ | 74 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ |
OLD | NEW |