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

Side by Side Diff: content/shell/renderer/webkit_test_runner.cc

Issue 629143003: Replace OVERRIDE and FINAL with override and final in content/shell/[a-s]* (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) 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 #include "content/shell/renderer/webkit_test_runner.h" 5 #include "content/shell/renderer/webkit_test_runner.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <clocale> 8 #include <clocale>
9 #include <cmath> 9 #include <cmath>
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 WebTask* task = reinterpret_cast<WebTask*>(context); 98 WebTask* task = reinterpret_cast<WebTask*>(context);
99 task->run(); 99 task->run();
100 delete task; 100 delete task;
101 } 101 }
102 102
103 class SyncNavigationStateVisitor : public RenderViewVisitor { 103 class SyncNavigationStateVisitor : public RenderViewVisitor {
104 public: 104 public:
105 SyncNavigationStateVisitor() {} 105 SyncNavigationStateVisitor() {}
106 virtual ~SyncNavigationStateVisitor() {} 106 virtual ~SyncNavigationStateVisitor() {}
107 107
108 virtual bool Visit(RenderView* render_view) OVERRIDE { 108 virtual bool Visit(RenderView* render_view) override {
109 SyncNavigationState(render_view); 109 SyncNavigationState(render_view);
110 return true; 110 return true;
111 } 111 }
112 private: 112 private:
113 DISALLOW_COPY_AND_ASSIGN(SyncNavigationStateVisitor); 113 DISALLOW_COPY_AND_ASSIGN(SyncNavigationStateVisitor);
114 }; 114 };
115 115
116 class ProxyToRenderViewVisitor : public RenderViewVisitor { 116 class ProxyToRenderViewVisitor : public RenderViewVisitor {
117 public: 117 public:
118 explicit ProxyToRenderViewVisitor(WebTestProxyBase* proxy) 118 explicit ProxyToRenderViewVisitor(WebTestProxyBase* proxy)
119 : proxy_(proxy), 119 : proxy_(proxy),
120 render_view_(NULL) { 120 render_view_(NULL) {
121 } 121 }
122 virtual ~ProxyToRenderViewVisitor() {} 122 virtual ~ProxyToRenderViewVisitor() {}
123 123
124 RenderView* render_view() const { return render_view_; } 124 RenderView* render_view() const { return render_view_; }
125 125
126 virtual bool Visit(RenderView* render_view) OVERRIDE { 126 virtual bool Visit(RenderView* render_view) override {
127 WebKitTestRunner* test_runner = WebKitTestRunner::Get(render_view); 127 WebKitTestRunner* test_runner = WebKitTestRunner::Get(render_view);
128 if (!test_runner) { 128 if (!test_runner) {
129 NOTREACHED(); 129 NOTREACHED();
130 return true; 130 return true;
131 } 131 }
132 if (test_runner->proxy() == proxy_) { 132 if (test_runner->proxy() == proxy_) {
133 render_view_ = render_view; 133 render_view_ = render_view;
134 return false; 134 return false;
135 } 135 }
136 return true; 136 return true;
137 } 137 }
138 138
139 private: 139 private:
140 WebTestProxyBase* proxy_; 140 WebTestProxyBase* proxy_;
141 RenderView* render_view_; 141 RenderView* render_view_;
142 142
143 DISALLOW_COPY_AND_ASSIGN(ProxyToRenderViewVisitor); 143 DISALLOW_COPY_AND_ASSIGN(ProxyToRenderViewVisitor);
144 }; 144 };
145 145
146 class NavigateAwayVisitor : public RenderViewVisitor { 146 class NavigateAwayVisitor : public RenderViewVisitor {
147 public: 147 public:
148 explicit NavigateAwayVisitor(RenderView* main_render_view) 148 explicit NavigateAwayVisitor(RenderView* main_render_view)
149 : main_render_view_(main_render_view) {} 149 : main_render_view_(main_render_view) {}
150 virtual ~NavigateAwayVisitor() {} 150 virtual ~NavigateAwayVisitor() {}
151 151
152 virtual bool Visit(RenderView* render_view) OVERRIDE { 152 virtual bool Visit(RenderView* render_view) override {
153 if (render_view == main_render_view_) 153 if (render_view == main_render_view_)
154 return true; 154 return true;
155 render_view->GetWebView()->mainFrame()->loadRequest( 155 render_view->GetWebView()->mainFrame()->loadRequest(
156 WebURLRequest(GURL(url::kAboutBlankURL))); 156 WebURLRequest(GURL(url::kAboutBlankURL)));
157 return true; 157 return true;
158 } 158 }
159 159
160 private: 160 private:
161 RenderView* main_render_view_; 161 RenderView* main_render_view_;
162 162
163 DISALLOW_COPY_AND_ASSIGN(NavigateAwayVisitor); 163 DISALLOW_COPY_AND_ASSIGN(NavigateAwayVisitor);
164 }; 164 };
165 165
166 class UseSynchronousResizeModeVisitor : public RenderViewVisitor { 166 class UseSynchronousResizeModeVisitor : public RenderViewVisitor {
167 public: 167 public:
168 explicit UseSynchronousResizeModeVisitor(bool enable) : enable_(enable) {} 168 explicit UseSynchronousResizeModeVisitor(bool enable) : enable_(enable) {}
169 virtual ~UseSynchronousResizeModeVisitor() {} 169 virtual ~UseSynchronousResizeModeVisitor() {}
170 170
171 virtual bool Visit(RenderView* render_view) OVERRIDE { 171 virtual bool Visit(RenderView* render_view) override {
172 UseSynchronousResizeMode(render_view, enable_); 172 UseSynchronousResizeMode(render_view, enable_);
173 return true; 173 return true;
174 } 174 }
175 175
176 private: 176 private:
177 bool enable_; 177 bool enable_;
178 }; 178 };
179 179
180 } // namespace 180 } // namespace
181 181
(...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 747
748 leak_detector_->TryLeakDetection(main_frame); 748 leak_detector_->TryLeakDetection(main_frame);
749 } 749 }
750 750
751 void WebKitTestRunner::ReportLeakDetectionResult( 751 void WebKitTestRunner::ReportLeakDetectionResult(
752 const LeakDetectionResult& report) { 752 const LeakDetectionResult& report) {
753 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report)); 753 Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
754 } 754 }
755 755
756 } // namespace content 756 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/renderer/webkit_test_runner.h ('k') | content/shell/tools/plugin/Tests/DocumentOpenInDestroyStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698