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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 324403007: Remove RenderViewImpl::FrameDidCommitProvisionalLoad (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 bool InitializeUserMediaClient(); 524 bool InitializeUserMediaClient();
525 525
526 blink::WebMediaPlayer* CreateWebMediaPlayerForMediaStream( 526 blink::WebMediaPlayer* CreateWebMediaPlayerForMediaStream(
527 const blink::WebURL& url, 527 const blink::WebURL& url,
528 blink::WebMediaPlayerClient* client); 528 blink::WebMediaPlayerClient* client);
529 529
530 // Creates a factory object used for creating audio and video renderers. 530 // Creates a factory object used for creating audio and video renderers.
531 // The method is virtual so that layouttests can override it. 531 // The method is virtual so that layouttests can override it.
532 virtual scoped_ptr<MediaStreamRendererFactory> CreateRendererFactory(); 532 virtual scoped_ptr<MediaStreamRendererFactory> CreateRendererFactory();
533 533
534 // Returns the URL being loaded by the |frame_|'s request.
535 GURL GetLoadingUrl() const;
536
534 #if defined(OS_ANDROID) 537 #if defined(OS_ANDROID)
535 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer( 538 blink::WebMediaPlayer* CreateAndroidWebMediaPlayer(
536 const blink::WebURL& url, 539 const blink::WebURL& url,
537 blink::WebMediaPlayerClient* client); 540 blink::WebMediaPlayerClient* client);
538 541
539 RendererMediaPlayerManager* GetMediaPlayerManager(); 542 RendererMediaPlayerManager* GetMediaPlayerManager();
540 #endif 543 #endif
541 544
542 #if defined(ENABLE_BROWSER_CDMS) 545 #if defined(ENABLE_BROWSER_CDMS)
543 RendererCdmManager* GetCdmManager(); 546 RendererCdmManager* GetCdmManager();
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
626 GeolocationDispatcher* geolocation_dispatcher_; 629 GeolocationDispatcher* geolocation_dispatcher_;
627 630
628 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 631 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
629 632
630 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 633 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
631 }; 634 };
632 635
633 } // namespace content 636 } // namespace content
634 637
635 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 638 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698