| 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 29 matching lines...) Expand all Loading... |
| 40 // Waits for a page with the given URL to appear and finish loading. | 40 // Waits for a page with the given URL to appear and finish loading. |
| 41 // Returns an error if the timeout is exceeded. | 41 // Returns an error if the timeout is exceeded. |
| 42 Status WaitForPageToLoad(const std::string& url, | 42 Status WaitForPageToLoad(const std::string& url, |
| 43 const base::TimeDelta& timeout, | 43 const base::TimeDelta& timeout, |
| 44 scoped_ptr<WebView>* web_view); | 44 scoped_ptr<WebView>* web_view); |
| 45 | 45 |
| 46 // Gets the installed automation extension. | 46 // Gets the installed automation extension. |
| 47 Status GetAutomationExtension(AutomationExtension** extension); | 47 Status GetAutomationExtension(AutomationExtension** extension); |
| 48 | 48 |
| 49 // Overridden from Chrome: | 49 // Overridden from Chrome: |
| 50 virtual ChromeDesktopImpl* GetAsDesktop() OVERRIDE; | 50 virtual ChromeDesktopImpl* GetAsDesktop() override; |
| 51 virtual std::string GetOperatingSystemName() OVERRIDE; | 51 virtual std::string GetOperatingSystemName() override; |
| 52 | 52 |
| 53 // Overridden from ChromeImpl: | 53 // Overridden from ChromeImpl: |
| 54 virtual bool IsMobileEmulationEnabled() const OVERRIDE; | 54 virtual bool IsMobileEmulationEnabled() const override; |
| 55 virtual Status QuitImpl() OVERRIDE; | 55 virtual Status QuitImpl() override; |
| 56 | 56 |
| 57 const base::CommandLine& command() const; | 57 const base::CommandLine& command() const; |
| 58 | 58 |
| 59 private: | 59 private: |
| 60 base::ProcessHandle process_; | 60 base::ProcessHandle process_; |
| 61 base::CommandLine command_; | 61 base::CommandLine command_; |
| 62 base::ScopedTempDir user_data_dir_; | 62 base::ScopedTempDir user_data_dir_; |
| 63 base::ScopedTempDir extension_dir_; | 63 base::ScopedTempDir extension_dir_; |
| 64 | 64 |
| 65 // Lazily initialized, may be null. | 65 // Lazily initialized, may be null. |
| 66 scoped_ptr<AutomationExtension> automation_extension_; | 66 scoped_ptr<AutomationExtension> automation_extension_; |
| 67 }; | 67 }; |
| 68 | 68 |
| 69 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ | 69 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_CHROME_DESKTOP_IMPL_H_ |
| OLD | NEW |