Index: chrome/test/chromedriver/chrome/web_view_impl.h |
diff --git a/chrome/test/chromedriver/chrome/web_view_impl.h b/chrome/test/chromedriver/chrome/web_view_impl.h |
index a9b4532814252dc9e51011d053c81c52439c52fd..03f1e0cbc4f1e3ba16fd483593de54aeffa2c4af 100644 |
--- a/chrome/test/chromedriver/chrome/web_view_impl.h |
+++ b/chrome/test/chromedriver/chrome/web_view_impl.h |
@@ -42,61 +42,57 @@ class WebViewImpl : public WebView { |
const BrowserInfo* browser_info, |
scoped_ptr<DevToolsClient> client, |
const DeviceMetrics* device_metrics); |
- virtual ~WebViewImpl(); |
+ ~WebViewImpl() override; |
// Overridden from WebView: |
- virtual std::string GetId() override; |
- virtual bool WasCrashed() override; |
- virtual Status ConnectIfNecessary() override; |
- virtual Status HandleReceivedEvents() override; |
- virtual Status Load(const std::string& url) override; |
- virtual Status Reload() override; |
- virtual Status EvaluateScript(const std::string& frame, |
- const std::string& expression, |
- scoped_ptr<base::Value>* result) override; |
- virtual Status CallFunction(const std::string& frame, |
- const std::string& function, |
- const base::ListValue& args, |
- scoped_ptr<base::Value>* result) override; |
- virtual Status CallAsyncFunction(const std::string& frame, |
- const std::string& function, |
- const base::ListValue& args, |
+ std::string GetId() override; |
+ bool WasCrashed() override; |
+ Status ConnectIfNecessary() override; |
+ Status HandleReceivedEvents() override; |
+ Status Load(const std::string& url) override; |
+ Status Reload() override; |
+ Status EvaluateScript(const std::string& frame, |
+ const std::string& expression, |
+ scoped_ptr<base::Value>* result) override; |
+ Status CallFunction(const std::string& frame, |
+ const std::string& function, |
+ const base::ListValue& args, |
+ scoped_ptr<base::Value>* result) override; |
+ Status CallAsyncFunction(const std::string& frame, |
+ const std::string& function, |
+ const base::ListValue& args, |
+ const base::TimeDelta& timeout, |
+ scoped_ptr<base::Value>* result) override; |
+ Status CallUserAsyncFunction(const std::string& frame, |
+ const std::string& function, |
+ const base::ListValue& args, |
+ const base::TimeDelta& timeout, |
+ scoped_ptr<base::Value>* result) override; |
+ Status GetFrameByFunction(const std::string& frame, |
+ const std::string& function, |
+ const base::ListValue& args, |
+ std::string* out_frame) override; |
+ Status DispatchMouseEvents(const std::list<MouseEvent>& events, |
+ const std::string& frame) override; |
+ Status DispatchTouchEvent(const TouchEvent& event) override; |
+ Status DispatchTouchEvents(const std::list<TouchEvent>& events) override; |
+ Status DispatchKeyEvents(const std::list<KeyEvent>& events) override; |
+ Status GetCookies(scoped_ptr<base::ListValue>* cookies) override; |
+ Status DeleteCookie(const std::string& name, const std::string& url) override; |
+ Status WaitForPendingNavigations(const std::string& frame_id, |
const base::TimeDelta& timeout, |
- scoped_ptr<base::Value>* result) override; |
- virtual Status CallUserAsyncFunction( |
- const std::string& frame, |
- const std::string& function, |
- const base::ListValue& args, |
- const base::TimeDelta& timeout, |
- scoped_ptr<base::Value>* result) override; |
- virtual Status GetFrameByFunction(const std::string& frame, |
- const std::string& function, |
- const base::ListValue& args, |
- std::string* out_frame) override; |
- virtual Status DispatchMouseEvents( |
- const std::list<MouseEvent>& events, const std::string& frame) override; |
- virtual Status DispatchTouchEvent(const TouchEvent& event) override; |
- virtual Status DispatchTouchEvents( |
- const std::list<TouchEvent>& events) override; |
- virtual Status DispatchKeyEvents(const std::list<KeyEvent>& events) override; |
- virtual Status GetCookies(scoped_ptr<base::ListValue>* cookies) override; |
- virtual Status DeleteCookie(const std::string& name, |
- const std::string& url) override; |
- virtual Status WaitForPendingNavigations(const std::string& frame_id, |
- const base::TimeDelta& timeout, |
- bool stop_load_on_timeout) override; |
- virtual Status IsPendingNavigation( |
- const std::string& frame_id, bool* is_pending) override; |
- virtual JavaScriptDialogManager* GetJavaScriptDialogManager() override; |
- virtual Status OverrideGeolocation(const Geoposition& geoposition) override; |
- virtual Status CaptureScreenshot(std::string* screenshot) override; |
- virtual Status SetFileInputFiles( |
- const std::string& frame, |
- const base::DictionaryValue& element, |
- const std::vector<base::FilePath>& files) override; |
- virtual Status TakeHeapSnapshot(scoped_ptr<base::Value>* snapshot) override; |
- virtual Status StartProfile() override; |
- virtual Status EndProfile(scoped_ptr<base::Value>* profile_data) override; |
+ bool stop_load_on_timeout) override; |
+ Status IsPendingNavigation(const std::string& frame_id, |
+ bool* is_pending) override; |
+ JavaScriptDialogManager* GetJavaScriptDialogManager() override; |
+ Status OverrideGeolocation(const Geoposition& geoposition) override; |
+ Status CaptureScreenshot(std::string* screenshot) override; |
+ Status SetFileInputFiles(const std::string& frame, |
+ const base::DictionaryValue& element, |
+ const std::vector<base::FilePath>& files) override; |
+ Status TakeHeapSnapshot(scoped_ptr<base::Value>* snapshot) override; |
+ Status StartProfile() override; |
+ Status EndProfile(scoped_ptr<base::Value>* profile_data) override; |
private: |
Status CallAsyncFunctionInternal(const std::string& frame, |