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

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

Issue 1382593004: Allow out-of-process iframes to update the mouse cursor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improved feng shui 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 818 matching lines...) Expand 10 before | Expand all | Expand 10 after
829 } 829 }
830 830
831 RegisterMojoServices(); 831 RegisterMojoServices();
832 832
833 // We delay calling this until we have the WebFrame so that any observer or 833 // We delay calling this until we have the WebFrame so that any observer or
834 // embedder can call GetWebFrame on any RenderFrame. 834 // embedder can call GetWebFrame on any RenderFrame.
835 GetContentClient()->renderer()->RenderFrameCreated(this); 835 GetContentClient()->renderer()->RenderFrameCreated(this);
836 } 836 }
837 837
838 RenderWidget* RenderFrameImpl::GetRenderWidget() { 838 RenderWidget* RenderFrameImpl::GetRenderWidget() {
839 if (render_widget_.get())
dcheng 2015/10/05 06:48:24 return render_widget_ ? render_widget.get() : rend
kenrb 2015/10/06 17:39:19 Done.
840 return render_widget_.get();
839 return render_view_.get(); 841 return render_view_.get();
840 } 842 }
841 843
842 #if defined(ENABLE_PLUGINS) 844 #if defined(ENABLE_PLUGINS)
843 void RenderFrameImpl::PepperPluginCreated(RendererPpapiHost* host) { 845 void RenderFrameImpl::PepperPluginCreated(RendererPpapiHost* host) {
844 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, 846 FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
845 DidCreatePepperPlugin(host)); 847 DidCreatePepperPlugin(host));
846 if (host->GetPluginName() == kFlashPluginName) { 848 if (host->GetPluginName() == kFlashPluginName) {
847 RenderThread::Get()->RecordAction( 849 RenderThread::Get()->RecordAction(
848 base::UserMetricsAction("FrameLoadWithFlash")); 850 base::UserMetricsAction("FrameLoadWithFlash"));
(...skipping 4337 matching lines...) Expand 10 before | Expand all | Expand 10 after
5186 mojo::ServiceProviderPtr service_provider; 5188 mojo::ServiceProviderPtr service_provider;
5187 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5189 mojo::URLRequestPtr request(mojo::URLRequest::New());
5188 request->url = mojo::String::From(url); 5190 request->url = mojo::String::From(url);
5189 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5191 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5190 nullptr, nullptr, 5192 nullptr, nullptr,
5191 base::Bind(&OnGotContentHandlerID)); 5193 base::Bind(&OnGotContentHandlerID));
5192 return service_provider.Pass(); 5194 return service_provider.Pass();
5193 } 5195 }
5194 5196
5195 } // namespace content 5197 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698