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

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

Issue 381683003: Fix enable_webrtc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add condition when enable_plugins = 1 Created 6 years, 5 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/TestInterfaces.h" 9 #include "content/shell/renderer/test_runner/TestInterfaces.h"
10 #include "content/shell/renderer/test_runner/WebTestDelegate.h" 10 #include "content/shell/renderer/test_runner/WebTestDelegate.h"
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, 269 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame,
270 target, event); 270 target, event);
271 } 271 }
272 272
273 virtual void didStopLoading() { 273 virtual void didStopLoading() {
274 base_proxy_->DidStopLoading(); 274 base_proxy_->DidStopLoading();
275 Base::didStopLoading(); 275 Base::didStopLoading();
276 } 276 }
277 277
278 private: 278 private:
279 #if defined(ENABLE_WEBRTC)
279 virtual scoped_ptr<MediaStreamRendererFactory> 280 virtual scoped_ptr<MediaStreamRendererFactory>
280 CreateRendererFactory() OVERRIDE { 281 CreateRendererFactory() OVERRIDE {
281 return scoped_ptr<MediaStreamRendererFactory>( 282 return scoped_ptr<MediaStreamRendererFactory>(
282 new TestMediaStreamRendererFactory()); 283 new TestMediaStreamRendererFactory());
283 } 284 }
pdr. 2014/07/12 02:34:49 You added an extra space here.
285 #endif
284 286
285 WebTestProxyBase* base_proxy_; 287 WebTestProxyBase* base_proxy_;
286 288
287 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 289 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
288 }; 290 };
289 291
290 } // namespace content 292 } // namespace content
291 293
292 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 294 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« content/content_renderer.gypi ('K') | « content/public/browser/render_process_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698