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

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

Issue 1035223003: Rename content::PermissionManager to content::PermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 8 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | 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 #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"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/debug/alias.h" 12 #include "base/debug/alias.h"
13 #include "base/debug/asan_invalid_access.h" 13 #include "base/debug/asan_invalid_access.h"
14 #include "base/debug/dump_without_crashing.h" 14 #include "base/debug/dump_without_crashing.h"
15 #include "base/i18n/char_iterator.h" 15 #include "base/i18n/char_iterator.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/process/process.h" 17 #include "base/process/process.h"
18 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
19 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
20 #include "base/time/time.h" 20 #include "base/time/time.h"
21 #include "cc/base/switches.h" 21 #include "cc/base/switches.h"
22 #include "content/child/appcache/appcache_dispatcher.h" 22 #include "content/child/appcache/appcache_dispatcher.h"
23 #include "content/child/permissions/permission_manager.h" 23 #include "content/child/permissions/permission_dispatcher.h"
24 #include "content/child/plugin_messages.h" 24 #include "content/child/plugin_messages.h"
25 #include "content/child/quota_dispatcher.h" 25 #include "content/child/quota_dispatcher.h"
26 #include "content/child/request_extra_data.h" 26 #include "content/child/request_extra_data.h"
27 #include "content/child/service_worker/service_worker_handle_reference.h" 27 #include "content/child/service_worker/service_worker_handle_reference.h"
28 #include "content/child/service_worker/service_worker_network_provider.h" 28 #include "content/child/service_worker/service_worker_network_provider.h"
29 #include "content/child/service_worker/service_worker_provider_context.h" 29 #include "content/child/service_worker/service_worker_provider_context.h"
30 #include "content/child/service_worker/web_service_worker_provider_impl.h" 30 #include "content/child/service_worker/web_service_worker_provider_impl.h"
31 #include "content/child/v8_value_converter_impl.h" 31 #include "content/child/v8_value_converter_impl.h"
32 #include "content/child/web_url_loader_impl.h" 32 #include "content/child/web_url_loader_impl.h"
33 #include "content/child/web_url_request_util.h" 33 #include "content/child/web_url_request_util.h"
(...skipping 3694 matching lines...) Expand 10 before | Expand all | Expand 10 after
3728 return true; 3728 return true;
3729 } 3729 }
3730 3730
3731 bool RenderFrameImpl::exitFullscreen() { 3731 bool RenderFrameImpl::exitFullscreen() {
3732 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false)); 3732 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false));
3733 return true; 3733 return true;
3734 } 3734 }
3735 3735
3736 blink::WebPermissionClient* RenderFrameImpl::permissionClient() { 3736 blink::WebPermissionClient* RenderFrameImpl::permissionClient() {
3737 if (!permission_client_) 3737 if (!permission_client_)
3738 permission_client_.reset(new PermissionManager(GetServiceRegistry())); 3738 permission_client_.reset(new PermissionDispatcher(GetServiceRegistry()));
3739 3739
3740 return permission_client_.get(); 3740 return permission_client_.get();
3741 } 3741 }
3742 3742
3743 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { 3743 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) {
3744 Send(new FrameHostMsg_MediaPlayingNotification( 3744 Send(new FrameHostMsg_MediaPlayingNotification(
3745 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), 3745 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(),
3746 player->hasAudio(), player->isRemote())); 3746 player->hasAudio(), player->isRemote()));
3747 } 3747 }
3748 3748
(...skipping 939 matching lines...) Expand 10 before | Expand all | Expand 10 after
4688 4688
4689 #if defined(ENABLE_BROWSER_CDMS) 4689 #if defined(ENABLE_BROWSER_CDMS)
4690 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4690 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4691 if (!cdm_manager_) 4691 if (!cdm_manager_)
4692 cdm_manager_ = new RendererCdmManager(this); 4692 cdm_manager_ = new RendererCdmManager(this);
4693 return cdm_manager_; 4693 return cdm_manager_;
4694 } 4694 }
4695 #endif // defined(ENABLE_BROWSER_CDMS) 4695 #endif // defined(ENABLE_BROWSER_CDMS)
4696 4696
4697 } // namespace content 4697 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698