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

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

Issue 2108003002: Merge //content/child/permissions into Blink's permissions module. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing presubmits. Created 4 years, 5 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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 17 matching lines...) Expand all
28 #include "base/stl_util.h" 28 #include "base/stl_util.h"
29 #include "base/strings/string16.h" 29 #include "base/strings/string16.h"
30 #include "base/strings/utf_string_conversions.h" 30 #include "base/strings/utf_string_conversions.h"
31 #include "base/threading/thread_task_runner_handle.h" 31 #include "base/threading/thread_task_runner_handle.h"
32 #include "base/time/time.h" 32 #include "base/time/time.h"
33 #include "base/trace_event/trace_event_argument.h" 33 #include "base/trace_event/trace_event_argument.h"
34 #include "build/build_config.h" 34 #include "build/build_config.h"
35 #include "cc/base/switches.h" 35 #include "cc/base/switches.h"
36 #include "components/scheduler/renderer/renderer_scheduler.h" 36 #include "components/scheduler/renderer/renderer_scheduler.h"
37 #include "content/child/appcache/appcache_dispatcher.h" 37 #include "content/child/appcache/appcache_dispatcher.h"
38 #include "content/child/permissions/permission_dispatcher.h"
39 #include "content/child/quota_dispatcher.h" 38 #include "content/child/quota_dispatcher.h"
40 #include "content/child/request_extra_data.h" 39 #include "content/child/request_extra_data.h"
41 #include "content/child/service_worker/service_worker_handle_reference.h" 40 #include "content/child/service_worker/service_worker_handle_reference.h"
42 #include "content/child/service_worker/service_worker_network_provider.h" 41 #include "content/child/service_worker/service_worker_network_provider.h"
43 #include "content/child/service_worker/service_worker_provider_context.h" 42 #include "content/child/service_worker/service_worker_provider_context.h"
44 #include "content/child/service_worker/web_service_worker_provider_impl.h" 43 #include "content/child/service_worker/web_service_worker_provider_impl.h"
45 #include "content/child/v8_value_converter_impl.h" 44 #include "content/child/v8_value_converter_impl.h"
46 #include "content/child/web_url_loader_impl.h" 45 #include "content/child/web_url_loader_impl.h"
47 #include "content/child/web_url_request_util.h" 46 #include "content/child/web_url_request_util.h"
48 #include "content/child/webmessageportchannel_impl.h" 47 #include "content/child/webmessageportchannel_impl.h"
(...skipping 4393 matching lines...) Expand 10 before | Expand all | Expand 10 after
4442 bool RenderFrameImpl::enterFullscreen() { 4441 bool RenderFrameImpl::enterFullscreen() {
4443 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, true)); 4442 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, true));
4444 return true; 4443 return true;
4445 } 4444 }
4446 4445
4447 bool RenderFrameImpl::exitFullscreen() { 4446 bool RenderFrameImpl::exitFullscreen() {
4448 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false)); 4447 Send(new FrameHostMsg_ToggleFullscreen(routing_id_, false));
4449 return true; 4448 return true;
4450 } 4449 }
4451 4450
4452 blink::WebPermissionClient* RenderFrameImpl::permissionClient() {
4453 if (!permission_client_) {
4454 permission_client_.reset(
4455 new PermissionDispatcher(GetRemoteInterfaces()));
4456 }
4457 return permission_client_.get();
4458 }
4459
4460 blink::WebAppBannerClient* RenderFrameImpl::appBannerClient() { 4451 blink::WebAppBannerClient* RenderFrameImpl::appBannerClient() {
4461 if (!app_banner_client_) { 4452 if (!app_banner_client_) {
4462 app_banner_client_ = 4453 app_banner_client_ =
4463 GetContentClient()->renderer()->CreateAppBannerClient(this); 4454 GetContentClient()->renderer()->CreateAppBannerClient(this);
4464 } 4455 }
4465 4456
4466 return app_banner_client_.get(); 4457 return app_banner_client_.get();
4467 } 4458 }
4468 4459
4469 void RenderFrameImpl::registerProtocolHandler(const WebString& scheme, 4460 void RenderFrameImpl::registerProtocolHandler(const WebString& scheme,
(...skipping 1839 matching lines...) Expand 10 before | Expand all | Expand 10 after
6309 // event target. Potentially a Pepper plugin will receive the event. 6300 // event target. Potentially a Pepper plugin will receive the event.
6310 // In order to tell whether a plugin gets the last mouse event and which it 6301 // In order to tell whether a plugin gets the last mouse event and which it
6311 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6302 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6312 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6303 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6313 // |pepper_last_mouse_event_target_|. 6304 // |pepper_last_mouse_event_target_|.
6314 pepper_last_mouse_event_target_ = nullptr; 6305 pepper_last_mouse_event_target_ = nullptr;
6315 #endif 6306 #endif
6316 } 6307 }
6317 6308
6318 } // namespace content 6309 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698