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

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

Issue 1091093006: Update {virtual,override} to follow C++11 style in content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Back out some webrtc files. Created 5 years, 8 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 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
278 source_frame, target_frame, target, event); 278 source_frame, target_frame, target, event);
279 } 279 }
280 280
281 virtual void didStopLoading() { 281 virtual void didStopLoading() {
282 base_proxy_->DidStopLoading(); 282 base_proxy_->DidStopLoading();
283 Base::didStopLoading(); 283 Base::didStopLoading();
284 } 284 }
285 285
286 private: 286 private:
287 #if defined(ENABLE_WEBRTC) 287 #if defined(ENABLE_WEBRTC)
288 virtual scoped_ptr<MediaStreamRendererFactory> CreateRendererFactory() 288 scoped_ptr<MediaStreamRendererFactory> CreateRendererFactory() override {
289 override {
290 return scoped_ptr<MediaStreamRendererFactory>( 289 return scoped_ptr<MediaStreamRendererFactory>(
291 new TestMediaStreamRendererFactory()); 290 new TestMediaStreamRendererFactory());
292 } 291 }
293 #endif 292 #endif
294 293
295 WebTestProxyBase* base_proxy_; 294 WebTestProxyBase* base_proxy_;
296 295
297 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 296 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
298 }; 297 };
299 298
300 } // namespace content 299 } // namespace content
301 300
302 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 301 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/shell/browser/shell_content_browser_client.h ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698