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

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 1226113002: Move protocol registration from WebViewClient to WebFrameClient, part 2/3. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/web/NavigatorContentUtilsClientImpl.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 #include "public/web/WebTestInterfaceFactory.h" 210 #include "public/web/WebTestInterfaceFactory.h"
211 #include "public/web/WebTreeScopeType.h" 211 #include "public/web/WebTreeScopeType.h"
212 #include "skia/ext/platform_device.h" 212 #include "skia/ext/platform_device.h"
213 #include "web/AssociatedURLLoader.h" 213 #include "web/AssociatedURLLoader.h"
214 #include "web/CompositionUnderlineVectorBuilder.h" 214 #include "web/CompositionUnderlineVectorBuilder.h"
215 #include "web/FindInPageCoordinates.h" 215 #include "web/FindInPageCoordinates.h"
216 #include "web/GeolocationClientProxy.h" 216 #include "web/GeolocationClientProxy.h"
217 #include "web/InspectorOverlayImpl.h" 217 #include "web/InspectorOverlayImpl.h"
218 #include "web/LocalFileSystemClient.h" 218 #include "web/LocalFileSystemClient.h"
219 #include "web/MIDIClientProxy.h" 219 #include "web/MIDIClientProxy.h"
220 #include "web/NavigatorContentUtilsClientImpl.h"
220 #include "web/NotificationPermissionClientImpl.h" 221 #include "web/NotificationPermissionClientImpl.h"
221 #include "web/PageOverlay.h" 222 #include "web/PageOverlay.h"
222 #include "web/RemoteBridgeFrameOwner.h" 223 #include "web/RemoteBridgeFrameOwner.h"
223 #include "web/SharedWorkerRepositoryClientImpl.h" 224 #include "web/SharedWorkerRepositoryClientImpl.h"
224 #include "web/SuspendableScriptExecutor.h" 225 #include "web/SuspendableScriptExecutor.h"
225 #include "web/TextFinder.h" 226 #include "web/TextFinder.h"
226 #include "web/WebDataSourceImpl.h" 227 #include "web/WebDataSourceImpl.h"
227 #include "web/WebDevToolsAgentImpl.h" 228 #include "web/WebDevToolsAgentImpl.h"
228 #include "web/WebFrameWidgetImpl.h" 229 #include "web/WebFrameWidgetImpl.h"
229 #include "web/WebPluginContainerImpl.h" 230 #include "web/WebPluginContainerImpl.h"
(...skipping 1475 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 if (m_frame) { 1706 if (m_frame) {
1706 if (m_client) 1707 if (m_client)
1707 providePushControllerTo(*m_frame, m_client->pushClient()); 1708 providePushControllerTo(*m_frame, m_client->pushClient());
1708 1709
1709 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create()); 1710 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create());
1710 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); 1711 provideUserMediaTo(*m_frame, &m_userMediaClientImpl);
1711 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); 1712 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get());
1712 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get())); 1713 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get()));
1713 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : nullptr)); 1714 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : nullptr));
1714 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); 1715 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1716 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl ::create(this));
1715 1717
1716 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1718 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1717 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client ->webScreenOrientationClient() : nullptr); 1719 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client ->webScreenOrientationClient() : nullptr);
1718 if (RuntimeEnabledFeatures::presentationEnabled()) 1720 if (RuntimeEnabledFeatures::presentationEnabled())
1719 PresentationController::provideTo(*m_frame, m_client ? m_client->pre sentationClient() : nullptr); 1721 PresentationController::provideTo(*m_frame, m_client ? m_client->pre sentationClient() : nullptr);
1720 if (RuntimeEnabledFeatures::permissionsEnabled()) 1722 if (RuntimeEnabledFeatures::permissionsEnabled())
1721 PermissionController::provideTo(*m_frame, m_client ? m_client->permi ssionClient() : nullptr); 1723 PermissionController::provideTo(*m_frame, m_client ? m_client->permi ssionClient() : nullptr);
1722 if (RuntimeEnabledFeatures::webVREnabled()) 1724 if (RuntimeEnabledFeatures::webVREnabled())
1723 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : nullptr); 1725 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : nullptr);
1724 } 1726 }
(...skipping 468 matching lines...) Expand 10 before | Expand all | Expand 10 after
2193 } 2195 }
2194 2196
2195 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2197 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2196 { 2198 {
2197 if (!frame()) 2199 if (!frame())
2198 return WebSandboxFlags::None; 2200 return WebSandboxFlags::None;
2199 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2201 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2200 } 2202 }
2201 2203
2202 } // namespace blink 2204 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/NavigatorContentUtilsClientImpl.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698