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

Side by Side Diff: content/shell/renderer/test_runner/web_frame_test_proxy.h

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h" 9 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"
10 #include "content/shell/renderer/test_runner/test_interfaces.h" 10 #include "content/shell/renderer/test_runner/test_interfaces.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 } 282 }
283 283
284 virtual void didStopLoading() { 284 virtual void didStopLoading() {
285 base_proxy_->DidStopLoading(); 285 base_proxy_->DidStopLoading();
286 Base::didStopLoading(); 286 Base::didStopLoading();
287 } 287 }
288 288
289 private: 289 private:
290 #if defined(ENABLE_WEBRTC) 290 #if defined(ENABLE_WEBRTC)
291 virtual scoped_ptr<MediaStreamRendererFactory> CreateRendererFactory() 291 virtual scoped_ptr<MediaStreamRendererFactory> CreateRendererFactory()
292 OVERRIDE { 292 override {
293 return scoped_ptr<MediaStreamRendererFactory>( 293 return scoped_ptr<MediaStreamRendererFactory>(
294 new TestMediaStreamRendererFactory()); 294 new TestMediaStreamRendererFactory());
295 } 295 }
296 #endif 296 #endif
297 297
298 WebTestProxyBase* base_proxy_; 298 WebTestProxyBase* base_proxy_;
299 299
300 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 300 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
301 }; 301 };
302 302
303 } // namespace content 303 } // namespace content
304 304
305 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 305 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/renderer/test_runner/web_ax_object_proxy.h ('k') | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698