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

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

Issue 968983002: Rename blink::WebWorkerPermissionProxyClient to blink::WebWorkerContentSettingsProxyClient. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix gypi typo Created 5 years, 9 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 1943 matching lines...) Expand 10 before | Expand all | Expand 10 after
1954 blink::WebLocalFrame* frame, 1954 blink::WebLocalFrame* frame,
1955 blink::WebApplicationCacheHostClient* client) { 1955 blink::WebApplicationCacheHostClient* client) {
1956 if (!frame || !frame->view()) 1956 if (!frame || !frame->view())
1957 return NULL; 1957 return NULL;
1958 DCHECK(!frame_ || frame_ == frame); 1958 DCHECK(!frame_ || frame_ == frame);
1959 return new RendererWebApplicationCacheHostImpl( 1959 return new RendererWebApplicationCacheHostImpl(
1960 RenderViewImpl::FromWebView(frame->view()), client, 1960 RenderViewImpl::FromWebView(frame->view()), client,
1961 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); 1961 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
1962 } 1962 }
1963 1963
1964 blink::WebWorkerPermissionClientProxy* 1964 blink::WebWorkerContentSettingsClientProxy*
1965 RenderFrameImpl::createWorkerPermissionClientProxy( 1965 RenderFrameImpl::createWorkerContentSettingsClientProxy(
1966 blink::WebLocalFrame* frame) { 1966 blink::WebLocalFrame* frame) {
1967 if (!frame || !frame->view()) 1967 if (!frame || !frame->view())
1968 return NULL; 1968 return NULL;
1969 DCHECK(!frame_ || frame_ == frame); 1969 DCHECK(!frame_ || frame_ == frame);
1970 return GetContentClient()->renderer()->CreateWorkerPermissionClientProxy( 1970 return GetContentClient()->renderer()->CreateWorkerContentSettingsClientProxy(
1971 this, frame); 1971 this, frame);
1972 } 1972 }
1973 1973
1974 WebExternalPopupMenu* RenderFrameImpl::createExternalPopupMenu( 1974 WebExternalPopupMenu* RenderFrameImpl::createExternalPopupMenu(
1975 const WebPopupMenuInfo& popup_menu_info, 1975 const WebPopupMenuInfo& popup_menu_info,
1976 WebExternalPopupMenuClient* popup_menu_client) { 1976 WebExternalPopupMenuClient* popup_menu_client) {
1977 #if defined(OS_MACOSX) || defined(OS_ANDROID) 1977 #if defined(OS_MACOSX) || defined(OS_ANDROID)
1978 // An IPC message is sent to the browser to build and display the actual 1978 // An IPC message is sent to the browser to build and display the actual
1979 // popup. The user could have time to click a different select by the time 1979 // popup. The user could have time to click a different select by the time
1980 // the popup is shown. In that case external_popup_menu_ is non NULL. 1980 // the popup is shown. In that case external_popup_menu_ is non NULL.
(...skipping 2462 matching lines...) Expand 10 before | Expand all | Expand 10 after
4443 4443
4444 #if defined(ENABLE_BROWSER_CDMS) 4444 #if defined(ENABLE_BROWSER_CDMS)
4445 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4445 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4446 if (!cdm_manager_) 4446 if (!cdm_manager_)
4447 cdm_manager_ = new RendererCdmManager(this); 4447 cdm_manager_ = new RendererCdmManager(this);
4448 return cdm_manager_; 4448 return cdm_manager_;
4449 } 4449 }
4450 #endif // defined(ENABLE_BROWSER_CDMS) 4450 #endif // defined(ENABLE_BROWSER_CDMS)
4451 4451
4452 } // namespace content 4452 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698