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

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: Put const in the right place 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 815 matching lines...) Expand 10 before | Expand all | Expand 10 after
826 } 826 }
827 827
828 RegisterMojoServices(); 828 RegisterMojoServices();
829 829
830 // We delay calling this until we have the WebFrame so that any observer or 830 // We delay calling this until we have the WebFrame so that any observer or
831 // embedder can call GetWebFrame on any RenderFrame. 831 // embedder can call GetWebFrame on any RenderFrame.
832 GetContentClient()->renderer()->RenderFrameCreated(this); 832 GetContentClient()->renderer()->RenderFrameCreated(this);
833 } 833 }
834 834
835 RenderWidget* RenderFrameImpl::GetRenderWidget() { 835 RenderWidget* RenderFrameImpl::GetRenderWidget() {
836 return render_view_.get(); 836 return render_widget_.get() ? render_widget_.get() : render_view_.get();
dcheng 2015/10/13 22:14:37 return render_widget_ ? render_widget_.get() : ren
kenrb 2015/10/14 16:29:53 Looks like we don't, I think I accidentally pulled
837 } 837 }
838 838
839 #if defined(ENABLE_PLUGINS) 839 #if defined(ENABLE_PLUGINS)
840 void RenderFrameImpl::PepperPluginCreated(RendererPpapiHost* host) { 840 void RenderFrameImpl::PepperPluginCreated(RendererPpapiHost* host) {
841 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, 841 FOR_EACH_OBSERVER(RenderFrameObserver, observers_,
842 DidCreatePepperPlugin(host)); 842 DidCreatePepperPlugin(host));
843 if (host->GetPluginName() == kFlashPluginName) { 843 if (host->GetPluginName() == kFlashPluginName) {
844 RenderThread::Get()->RecordAction( 844 RenderThread::Get()->RecordAction(
845 base::UserMetricsAction("FrameLoadWithFlash")); 845 base::UserMetricsAction("FrameLoadWithFlash"));
846 } 846 }
(...skipping 4344 matching lines...) Expand 10 before | Expand all | Expand 10 after
5191 mojo::ServiceProviderPtr service_provider(21); 5191 mojo::ServiceProviderPtr service_provider(21);
5192 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5192 mojo::URLRequestPtr request(mojo::URLRequest::New());
5193 request->url = mojo::String::From(url); 5193 request->url = mojo::String::From(url);
5194 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5194 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5195 nullptr, nullptr, 5195 nullptr, nullptr,
5196 base::Bind(&OnGotContentHandlerID)); 5196 base::Bind(&OnGotContentHandlerID));
5197 return service_provider.Pass(); 5197 return service_provider.Pass();
5198 } 5198 }
5199 5199
5200 } // namespace content 5200 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698