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

Side by Side Diff: chrome/test/chromedriver/chrome/web_view_impl.h

Issue 637933002: Replace FINAL and OVERRIDE with their C++11 counterparts in chrome/test (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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
OLDNEW
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_WEB_VIEW_IMPL_H_ 5 #ifndef CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_
6 #define CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_ 6 #define CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <string> 9 #include <string>
10 10
(...skipping 27 matching lines...) Expand all
38 WebViewImpl(const std::string& id, 38 WebViewImpl(const std::string& id,
39 const BrowserInfo* browser_info, 39 const BrowserInfo* browser_info,
40 scoped_ptr<DevToolsClient> client); 40 scoped_ptr<DevToolsClient> client);
41 WebViewImpl(const std::string& id, 41 WebViewImpl(const std::string& id,
42 const BrowserInfo* browser_info, 42 const BrowserInfo* browser_info,
43 scoped_ptr<DevToolsClient> client, 43 scoped_ptr<DevToolsClient> client,
44 const DeviceMetrics* device_metrics); 44 const DeviceMetrics* device_metrics);
45 virtual ~WebViewImpl(); 45 virtual ~WebViewImpl();
46 46
47 // Overridden from WebView: 47 // Overridden from WebView:
48 virtual std::string GetId() OVERRIDE; 48 virtual std::string GetId() override;
49 virtual bool WasCrashed() OVERRIDE; 49 virtual bool WasCrashed() override;
50 virtual Status ConnectIfNecessary() OVERRIDE; 50 virtual Status ConnectIfNecessary() override;
51 virtual Status HandleReceivedEvents() OVERRIDE; 51 virtual Status HandleReceivedEvents() override;
52 virtual Status Load(const std::string& url) OVERRIDE; 52 virtual Status Load(const std::string& url) override;
53 virtual Status Reload() OVERRIDE; 53 virtual Status Reload() override;
54 virtual Status EvaluateScript(const std::string& frame, 54 virtual Status EvaluateScript(const std::string& frame,
55 const std::string& expression, 55 const std::string& expression,
56 scoped_ptr<base::Value>* result) OVERRIDE; 56 scoped_ptr<base::Value>* result) override;
57 virtual Status CallFunction(const std::string& frame, 57 virtual Status CallFunction(const std::string& frame,
58 const std::string& function, 58 const std::string& function,
59 const base::ListValue& args, 59 const base::ListValue& args,
60 scoped_ptr<base::Value>* result) OVERRIDE; 60 scoped_ptr<base::Value>* result) override;
61 virtual Status CallAsyncFunction(const std::string& frame, 61 virtual Status CallAsyncFunction(const std::string& frame,
62 const std::string& function, 62 const std::string& function,
63 const base::ListValue& args, 63 const base::ListValue& args,
64 const base::TimeDelta& timeout, 64 const base::TimeDelta& timeout,
65 scoped_ptr<base::Value>* result) OVERRIDE; 65 scoped_ptr<base::Value>* result) override;
66 virtual Status CallUserAsyncFunction( 66 virtual Status CallUserAsyncFunction(
67 const std::string& frame, 67 const std::string& frame,
68 const std::string& function, 68 const std::string& function,
69 const base::ListValue& args, 69 const base::ListValue& args,
70 const base::TimeDelta& timeout, 70 const base::TimeDelta& timeout,
71 scoped_ptr<base::Value>* result) OVERRIDE; 71 scoped_ptr<base::Value>* result) override;
72 virtual Status GetFrameByFunction(const std::string& frame, 72 virtual Status GetFrameByFunction(const std::string& frame,
73 const std::string& function, 73 const std::string& function,
74 const base::ListValue& args, 74 const base::ListValue& args,
75 std::string* out_frame) OVERRIDE; 75 std::string* out_frame) override;
76 virtual Status DispatchMouseEvents( 76 virtual Status DispatchMouseEvents(
77 const std::list<MouseEvent>& events, const std::string& frame) OVERRIDE; 77 const std::list<MouseEvent>& events, const std::string& frame) override;
78 virtual Status DispatchTouchEvent(const TouchEvent& event) OVERRIDE; 78 virtual Status DispatchTouchEvent(const TouchEvent& event) override;
79 virtual Status DispatchTouchEvents( 79 virtual Status DispatchTouchEvents(
80 const std::list<TouchEvent>& events) OVERRIDE; 80 const std::list<TouchEvent>& events) override;
81 virtual Status DispatchKeyEvents(const std::list<KeyEvent>& events) OVERRIDE; 81 virtual Status DispatchKeyEvents(const std::list<KeyEvent>& events) override;
82 virtual Status GetCookies(scoped_ptr<base::ListValue>* cookies) OVERRIDE; 82 virtual Status GetCookies(scoped_ptr<base::ListValue>* cookies) override;
83 virtual Status DeleteCookie(const std::string& name, 83 virtual Status DeleteCookie(const std::string& name,
84 const std::string& url) OVERRIDE; 84 const std::string& url) override;
85 virtual Status WaitForPendingNavigations(const std::string& frame_id, 85 virtual Status WaitForPendingNavigations(const std::string& frame_id,
86 const base::TimeDelta& timeout, 86 const base::TimeDelta& timeout,
87 bool stop_load_on_timeout) OVERRIDE; 87 bool stop_load_on_timeout) override;
88 virtual Status IsPendingNavigation( 88 virtual Status IsPendingNavigation(
89 const std::string& frame_id, bool* is_pending) OVERRIDE; 89 const std::string& frame_id, bool* is_pending) override;
90 virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE; 90 virtual JavaScriptDialogManager* GetJavaScriptDialogManager() override;
91 virtual Status OverrideGeolocation(const Geoposition& geoposition) OVERRIDE; 91 virtual Status OverrideGeolocation(const Geoposition& geoposition) override;
92 virtual Status CaptureScreenshot(std::string* screenshot) OVERRIDE; 92 virtual Status CaptureScreenshot(std::string* screenshot) override;
93 virtual Status SetFileInputFiles( 93 virtual Status SetFileInputFiles(
94 const std::string& frame, 94 const std::string& frame,
95 const base::DictionaryValue& element, 95 const base::DictionaryValue& element,
96 const std::vector<base::FilePath>& files) OVERRIDE; 96 const std::vector<base::FilePath>& files) override;
97 virtual Status TakeHeapSnapshot(scoped_ptr<base::Value>* snapshot) OVERRIDE; 97 virtual Status TakeHeapSnapshot(scoped_ptr<base::Value>* snapshot) override;
98 virtual Status StartProfile() OVERRIDE; 98 virtual Status StartProfile() override;
99 virtual Status EndProfile(scoped_ptr<base::Value>* profile_data) OVERRIDE; 99 virtual Status EndProfile(scoped_ptr<base::Value>* profile_data) override;
100 100
101 private: 101 private:
102 Status CallAsyncFunctionInternal(const std::string& frame, 102 Status CallAsyncFunctionInternal(const std::string& frame,
103 const std::string& function, 103 const std::string& function,
104 const base::ListValue& args, 104 const base::ListValue& args,
105 bool is_user_supplied, 105 bool is_user_supplied,
106 const base::TimeDelta& timeout, 106 const base::TimeDelta& timeout,
107 scoped_ptr<base::Value>* result); 107 scoped_ptr<base::Value>* result);
108 Status IsNotPendingNavigation(const std::string& frame_id, 108 Status IsNotPendingNavigation(const std::string& frame_id,
109 bool* is_not_pending); 109 bool* is_not_pending);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 Status GetNodeIdFromFunction(DevToolsClient* client, 149 Status GetNodeIdFromFunction(DevToolsClient* client,
150 int context_id, 150 int context_id,
151 const std::string& function, 151 const std::string& function,
152 const base::ListValue& args, 152 const base::ListValue& args,
153 bool* found_node, 153 bool* found_node,
154 int* node_id); 154 int* node_id);
155 155
156 } // namespace internal 156 } // namespace internal
157 157
158 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_ 158 #endif // CHROME_TEST_CHROMEDRIVER_CHROME_WEB_VIEW_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/test/chromedriver/chrome/stub_web_view.h ('k') | chrome/test/chromedriver/chrome/web_view_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698