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

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

Issue 1398823004: Switch the page-capturing machinery to use the new hooks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1839 matching lines...) Expand 10 before | Expand all | Expand 10 after
1850 std::string error_html; 1850 std::string error_html;
1851 GetContentClient()->renderer()->GetNavigationErrorStrings( 1851 GetContentClient()->renderer()->GetNavigationErrorStrings(
1852 render_view(), frame_, failed_request, error, &error_html, NULL); 1852 render_view(), frame_, failed_request, error, &error_html, NULL);
1853 1853
1854 frame_->loadHTMLString(error_html, 1854 frame_->loadHTMLString(error_html,
1855 GURL(kUnreachableWebDataURL), 1855 GURL(kUnreachableWebDataURL),
1856 error.unreachableURL, 1856 error.unreachableURL,
1857 replace); 1857 replace);
1858 } 1858 }
1859 1859
1860 void RenderFrameImpl::DidMeaningfulLayout(
1861 blink::WebMeaningfulLayout layout_type) {
1862 FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
1863 DidMeaningfulLayout(layout_type));
1864 }
1865
1860 void RenderFrameImpl::DidCommitCompositorFrame() { 1866 void RenderFrameImpl::DidCommitCompositorFrame() {
1861 if (BrowserPluginManager::Get()) 1867 if (BrowserPluginManager::Get())
1862 BrowserPluginManager::Get()->DidCommitCompositorFrame(GetRoutingID()); 1868 BrowserPluginManager::Get()->DidCommitCompositorFrame(GetRoutingID());
1863 FOR_EACH_OBSERVER( 1869 FOR_EACH_OBSERVER(
1864 RenderFrameObserver, observers_, DidCommitCompositorFrame()); 1870 RenderFrameObserver, observers_, DidCommitCompositorFrame());
1865 } 1871 }
1866 1872
1867 RenderView* RenderFrameImpl::GetRenderView() { 1873 RenderView* RenderFrameImpl::GetRenderView() {
1868 return render_view_.get(); 1874 return render_view_.get();
1869 } 1875 }
(...skipping 3321 matching lines...) Expand 10 before | Expand all | Expand 10 after
5191 mojo::ServiceProviderPtr service_provider(21); 5197 mojo::ServiceProviderPtr service_provider(21);
5192 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5198 mojo::URLRequestPtr request(mojo::URLRequest::New());
5193 request->url = mojo::String::From(url); 5199 request->url = mojo::String::From(url);
5194 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5200 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5195 nullptr, nullptr, 5201 nullptr, nullptr,
5196 base::Bind(&OnGotContentHandlerID)); 5202 base::Bind(&OnGotContentHandlerID));
5197 return service_provider.Pass(); 5203 return service_provider.Pass();
5198 } 5204 }
5199 5205
5200 } // namespace content 5206 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698